This shows you the differences between two versions of the page.
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: |