Comments on: Commiting to a new branch with Subversion http://www.blizzo.com/commiting-to-a-new-branch-with-subversion/ Randomness for you since 1976 Wed, 07 Jan 2009 04:53:45 +0000 http://wordpress.org/?v=2.6.2 By: F. Morgan Whitney http://www.blizzo.com/commiting-to-a-new-branch-with-subversion/#comment-3213 F. Morgan Whitney Wed, 03 Sep 2008 18:50:32 +0000 http://www.blizzo.com/?p=171#comment-3213 In case anyone is keeping score, this totally didn't work. Do what John said :) In case anyone is keeping score, this totally didn’t work. Do what John said :)

]]> By: Peter Williams http://www.blizzo.com/commiting-to-a-new-branch-with-subversion/#comment-2985 Peter Williams Mon, 25 Aug 2008 16:31:41 +0000 http://www.blizzo.com/?p=171#comment-2985 If you want to do feature branching like this you should definitely consider switching to Git, Mercurial or Bazaar. They make this sort of thing dead simple. Oh, and they make just about everything else about source control easier too. If you want to do feature branching like this you should definitely consider switching to Git, Mercurial or Bazaar. They make this sort of thing dead simple. Oh, and they make just about everything else about source control easier too.

]]> By: F. Morgan Whitney http://www.blizzo.com/commiting-to-a-new-branch-with-subversion/#comment-2860 F. Morgan Whitney Fri, 22 Aug 2008 14:20:13 +0000 http://www.blizzo.com/?p=171#comment-2860 My svn copy actually seemed to copy form the trunk in the repo and not my checked out copy, as non of the new or modified files appeared in the new branch, so I wonder if . or the trunk URL really matters. I did use a URL for the branch in my actual implementation. Another tip for anyone who stumbles across this, to find the revision number from when you created your branch, you can use: svn log --stop-on-copy This article has a fairly straight forward step by step for merging your branches into your trunk: http://www.sepcot.com/blog/2007/04/SVN-Merge-Branch-Trunk My svn copy actually seemed to copy form the trunk in the repo and not my checked out copy, as non of the new or modified files appeared in the new branch, so I wonder if . or the trunk URL really matters. I did use a URL for the branch in my actual implementation.

Another tip for anyone who stumbles across this, to find the revision number from when you created your branch, you can use:

svn log –stop-on-copy

This article has a fairly straight forward step by step for merging your branches into your trunk:

http://www.sepcot.com/blog/2007/04/SVN-Merge-Branch-Trunk

]]> By: John http://www.blizzo.com/commiting-to-a-new-branch-with-subversion/#comment-2848 John Thu, 21 Aug 2008 23:40:16 +0000 http://www.blizzo.com/?p=171#comment-2848 This is reasonably close, but not quite right.. Also, instead of doing an svn cp on your local working copy you're better off doing it against the server. The form of the command is the same, but you're using urls for the source and endpoint. It should look something like: 1. Create your branch with: svn cp http://server/project/trunk http://server/project/branches/branch_o_doom -m "Creating my branch to take over the world" 2. Move your working copy to the branch: svn switch http://server/project/branches/branch_o_doom 3. Do your work.. update from the repo, modify files, add files, check in, etc as usual Now for merging your branch back to trunk you need to figure out what file range needs to be merged, then merge it back. Svn won't do merges on the server itself (for good reason) so you usually do this against another local working copy. 1. Find out the revision range on the branch: svn log --stop-on-copy http://server/project/branches/branch_o_doom It'll give you a log of all the commits on the branch, stopping on the initial copy that created it. Note that revision number. 2. Checkout trunk (or cd to it, whatever): svn co http://server/project/trunk 3. Merge it! (this is against a checkout of trunk): svn merge -r 7424:HEAD http://server/project/branches/branch_o_doom 4. Sanity check what it did. 5. Commit it back to trunk (note that its good form to notate the rev range you're merging): svn ci -m "Merging branch_o_doom to trunk r7424:r:7535" This is reasonably close, but not quite right.. Also, instead of doing an svn cp on your local working copy you’re better off doing it against the server. The form of the command is the same, but you’re using urls for the source and endpoint.

It should look something like:
1. Create your branch with: svn cp http://server/project/trunk http://server/project/branches/branch_o_doom -m “Creating my branch to take over the world”
2. Move your working copy to the branch: svn switch http://server/project/branches/branch_o_doom
3. Do your work.. update from the repo, modify files, add files, check in, etc as usual

Now for merging your branch back to trunk you need to figure out what file range needs to be merged, then merge it back. Svn won’t do merges on the server itself (for good reason) so you usually do this against another local working copy.
1. Find out the revision range on the branch: svn log –stop-on-copy http://server/project/branches/branch_o_doom
It’ll give you a log of all the commits on the branch, stopping on the initial copy that created it. Note that revision number.

2. Checkout trunk (or cd to it, whatever): svn co http://server/project/trunk

3. Merge it! (this is against a checkout of trunk): svn merge -r 7424:HEAD http://server/project/branches/branch_o_doom

4. Sanity check what it did.

5. Commit it back to trunk (note that its good form to notate the rev range you’re merging): svn ci -m “Merging branch_o_doom to trunk r7424:r:7535″

]]>