Merging (1/4)

OK, so you've branched, done lots of development on the branch, and are ready to merge back to the trunk (trunk is really nothing more than the “main” branch)
Use svn merge: svn merge -r <rev>:<rev> <source>
How does one determine the starting and ending revisions for the range? : jmglov@laurana; svn log --stop-on-copy ../branches/BLEEDING_EDGE ------------------------------------------------------------------------ r13 | jmglov | 2005-03-30 11:55:04 -0500 (Wed, 30 Mar 2005) | 1 line created branch for new features ------------------------------------------------------------------------ : jmglov@laurana; svn stat -u Status against revision: 16

OK, so you've branched, done lots of development on the branch, and are ready to merge back to the trunk (trunk is really nothing more than the “main” branch)