Thursday, April 18, 2013

SVN merge between trunk & branch

Branched out 'branch_xxx' for feature AA, after branch out 'trunk' is continue changes, now need all changes on 'trunk' merge to 'branch_xxx'.

1. Find out the version since branch_xxx copy.
    svn log -v --stop-on-copy

<comment>
------------------------------------------------------------------------
r503 | <user> | 2013-03-06 10:56:01 +0800 (Wed, 06 Mar 2013) | 1 line

2. svn merge -r 503:519  svn+ssh://user@svnurl/var/local/svn/proj/trunk
ver 519 is trunk latest ver, you might have some conflicts need to resolve.

3. svn ci -m "comment"