Changes between Version 35 and Version 36 of HowToSVN


Ignore:
Timestamp:
Aug 28, 2009, 12:14:59 AM (15 years ago)
Author:
hamish
Comment:

svn switch --relocate

Legend:

Unmodified
Added
Removed
Modified

  • HowToSVN

    v35 v36  
    2424
    2525{{{
    26     cd /path/to/your/local/copy/trunk
    27     svn switch https://svn.osgeo.org/grass/grass/branches/develbranch_6 .
     26cd /path/to/your/local/copy/trunk
     27svn switch https://svn.osgeo.org/grass/grass/branches/develbranch_6 .
    2828}}}
    2929
    … …  
    3232To find other branch names, check [http://trac.osgeo.org/grass/browser/grass/branches/ here].
    3333
     34To be able to merge new files between branches both branches will have to appear to be from the same master repository. Subversion does not recognize `http://` and `https://` to be the same. In those cases the following command can be given to reassign http to https:
     35
     36{{{
     37svn switch --relocate \
     38   http://svn.osgeo.org/grass/grass/branches/releasebranch_6_4 \
     39   https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4 .
     40}}}
    3441
    3542== SVN usage ==
    … …  
    4855
    4956{{{
    50     svn up raster/r.digit/
     57svn up raster/r.digit/
    5158}}}
    5259
    … …  
    5865View changes:
    5966{{{
    60     svn diff raster/r.digit/
     67svn diff raster/r.digit/
    6168}}}
    6269
    … …  
    6471(run from top dir not the module dir. There are many "main.c" and "description.html" files to choose from and without the directory name it is hard to figure out where your patch should be applied)
    6572{{{
    66     svn diff raster/r.digit/ > fancy_new.diff
     73svn diff raster/r.digit/ > fancy_new.diff
    6774}}}
    6875
    … …  
    96103 * '''Please make the {{{-m}}} commit log message meaningful'''. It is your chance to explain "why". If you refer to bug numbers in the form "#123" the Trac system will automatically create a link from the message to the bug report. The same is true for revision changes, e.g. "r12345".
    97104{{{
    98     svn diff raster/r.digit/main.c | less
    99     svn commit raster/r.digit/main.c \
    100       -m "fix bug #123: uninitialized variable (merge r12345 from trunk)"
     105svn diff raster/r.digit/main.c | less
     106svn commit raster/r.digit/main.c \
     107  -m "fix bug #123: uninitialized variable (merge r12345 from trunk)"
    101108}}}
    102109
    … …  
    107114 * Example 1: pull a change from trunk into the 6.3 release branch:
    108115{{{
    109     cd releasebranch_6_3/
    110     svn up raster/r.digit/
    111     svn merge -c 30749 https://svn.osgeo.org/grass/grass/trunk
    112     svn diff raster/r.digit/main.c
    113     svn commit raster/r.digit/main.c \
    114       -m "fix bug #456: unsafe quoting (merge from trunk, r30749)"
     116cd releasebranch_6_3/
     117svn up raster/r.digit/
     118svn merge -c 30749 https://svn.osgeo.org/grass/grass/trunk
     119svn diff raster/r.digit/main.c
     120svn commit raster/r.digit/main.c \
     121  -m "fix bug #456: unsafe quoting (merge from trunk, r30749)"
    115122}}}
    116123
    … …  
    119126 * Example 2: merge a change from the 6.4 development branch into GRASS 7 (trunk):
    120127{{{
    121     cd trunk/
    122     svn up raster/r.digit/
    123     svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/develbranch_6
    124     svn diff raster/r.digit/main.c
    125     svn commit raster/r.digit/main.c
     128cd trunk/
     129svn up raster/r.digit/
     130svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/develbranch_6
     131svn diff raster/r.digit/main.c
     132svn commit raster/r.digit/main.c
    126133}}}
    127134
    … …  
    147154
    148155{{{
    149     svn checkout --non-recursive https://svn.osgeo.org/grass/grass-web/trunk/ trunk/
     156svn checkout --non-recursive \
     157  https://svn.osgeo.org/grass/grass-web/trunk/ trunk/
    150158}}}
    151159
    … …  
    179187
    180188
    181 
    182 
    183189== See Also ==
    184190