Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Last revision Both sides next revision
svn:release_cycle [2010/08/28 14:01]
Toni Corvera
svn:release_cycle [2010/08/28 14:02]
Toni Corvera
Line 37: Line 37:
   [wcopy]$ svn merge -r1600:HEAD url://​SOURCE_BRANCH .   [wcopy]$ svn merge -r1600:HEAD url://​SOURCE_BRANCH .
          # Fix conflicts. Only *actual* conflicts should be shown, normal changes should integrate correctly          # Fix conflicts. Only *actual* conflicts should be shown, normal changes should integrate correctly
-  [wcopy]$ svn ci -m "* Merge from branch X, r1600:​1700"​ # Log revisions for later merges (check with ''svn log'')+  [wcopy]$ svn ci -m "* Merge from branch X, r1600:​1700"​ # Log revisions for later merges (check with 'svn log')
  
 Later merges should be restricted to the non-merged revisions: Later merges should be restricted to the non-merged revisions:
svn/release_cycle.txt ยท Last modified: 2011/08/01 17:15 by Toni Corvera
 
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Noncommercial-Share Alike 3.0 Unported
Recent changes RSS feed Donate Powered by PHP Valid XHTML 1.0 Valid CSS Driven by DokuWiki