To keep all may changes different from the main development I’ve created a subversion branch. Now I want to keep the branch up to date with changes from the main trunk.
r421 | sstillwell | 2010-01-22 18:40:42 -0600 (Fri, 22 Jan 2010) | 1 line
r420 | sstillwell | 2010-01-22 18:30:52 -0600 (Fri, 22 Jan 2010) | 1 line
r413 | sstillwell | 2010-01-15 12:51:25 -0600 (Fri, 15 Jan 2010) | 1 line
r408 | sstillwell | 2010-01-06 17:22:55 -0600 (Wed, 06 Jan 2010) | 1 line
r406 | sstillwell | 2010-01-06 17:09:12 -0600 (Wed, 06 Jan 2010) | 1 line
r405 | sstillwell | 2010-01-06 16:25:39 -0600 (Wed, 06 Jan 2010) | 1 line
From the command
svn log --stop-on-copy we can see that the branch was created at version 405.
Change directory to the top directory of your particular branch (e.g. application/branches/new-module-dev/)
Now take a dry run at the merge
svn merge --dry-run -r 405:421 http://svn.example.com/repos/application/trunk/
Everything look OK? remove
--dry-run and really apply them.
svn merge -r 405:421 http://svn.example.com/repos/application/trunk/
Remember! You’re only updating your local copy, you still have to commit these merged updates.
Did this help you out? It took me a few days to piece together all this information together, I hope this saves you some time (who knows, maybe the future me will be thankful I wrote this down). Let me know your thoughts. firstname.lastname@example.org