Changes between Version 46 and Version 47 of HowToSVN


Ignore:
Timestamp:
Apr 6, 2014, 7:42:50 AM (10 years ago)
Author:
martinl
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • HowToSVN

    v46 v47  
    150150where {{{30749}}} is the revision number of the changeset you wish to backport.
    151151
    152  * Example 2: merge a change from the 6.4 development branch into GRASS 7 (trunk):
     152 * Example 2: merge a change from the 6.4 release branch into GRASS 7 (trunk):
    153153{{{
    154154cd trunk/
    155155svn up raster/r.digit/
    156 svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/develbranch_6
     156svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4
    157157svn diff raster/r.digit/main.c
    158158svn commit raster/r.digit/main.c