Changes between Version 46 and Version 47 of HowToSVN
- Timestamp:
- 04/06/14 07:42:50 (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
HowToSVN
v46 v47 150 150 where {{{30749}}} is the revision number of the changeset you wish to backport. 151 151 152 * Example 2: merge a change from the 6.4 developmentbranch into GRASS 7 (trunk):152 * Example 2: merge a change from the 6.4 release branch into GRASS 7 (trunk): 153 153 {{{ 154 154 cd trunk/ 155 155 svn up raster/r.digit/ 156 svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/ develbranch_6156 svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4 157 157 svn diff raster/r.digit/main.c 158 158 svn commit raster/r.digit/main.c