207 | | Run the command from within the target branch. |
208 | | * Example 1: pull a change from trunk into the 7.2 release branch: |
209 | | {{{ |
210 | | cd releasebranch_7_2/ |
211 | | svn up raster/r.digit/ |
212 | | svn merge -c 30749 https://svn.osgeo.org/grass/grass/trunk |
213 | | svn diff raster/r.digit/main.c |
214 | | svn commit raster/r.digit/main.c -m "fix bug #456: unsafe quoting (merge from trunk, r30749)" |
215 | | }}} |
216 | | |
217 | | where {{{30749}}} is the revision number of the changeset you wish to backport. |
218 | | |
219 | | * Example 2: merge a change from the old 6.4 release branch into GRASS 7 (trunk): |
220 | | {{{ |
221 | | cd trunk/ |
222 | | svn up raster/r.digit/ |
223 | | svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4 |
224 | | svn diff raster/r.digit/main.c |
225 | | svn commit raster/r.digit/main.c -m"clean up help page, option descriptions (merge from relbr64, r31154)" |
| 207 | Please see **[[wiki:HowToBackport]] for the procedure**. |
| 208 | |
| 209 | |
| 210 | ''Old style (not recommended):'' |
| 211 | |
| 212 | ~~Run the command from within the target branch.~~ |
| 213 | * ~~Example 1: pull a change from trunk into the 7.2 release branch:~~ |
| 214 | {{{ |
| 215 | ### OLD STYLE, see above for modern style |
| 216 | #cd releasebranch_7_2/ |
| 217 | #svn up raster/r.digit/ |
| 218 | #svn merge -c 30749 https://svn.osgeo.org/grass/grass/trunk |
| 219 | #svn diff raster/r.digit/main.c |
| 220 | #svn commit raster/r.digit/main.c -m "fix bug #456: unsafe quoting (merge from trunk, r30749)" |
| 221 | }}} |
| 222 | |
| 223 | ~~where {{{30749}}} is the revision number of the changeset you wish to backport.~~ |
| 224 | |
| 225 | * ~~Example 2: merge a change from the old 6.4 release branch into GRASS 7 (trunk):~~ |
| 226 | {{{ |
| 227 | ### OLD STYLE, see above for modern style |
| 228 | #cd trunk/ |
| 229 | #svn up raster/r.digit/ |
| 230 | #svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4 |
| 231 | #svn diff raster/r.digit/main.c |
| 232 | #svn commit raster/r.digit/main.c -m"clean up help page, option descriptions (merge from relbr64, r31154)" |