I’d like to take a moment to (a) completely alienate my audience, and (b) ruin my credibility. I will do this by discussing the semantics of a particular operation of the Subversion version control system, and explaining how poorly I initially understood it.
It took me a while to realize how
svn merge should be used. My intuitive sense of the usage of the command diverged significantly from its actual use.
When I think of it as “merge” the syntax that intuitively appears is
svn merge [source] [target], with the intent of merging “source” into “target”.
This led to my attempting to merge from branch HEAD to trunk HEAD, and be puzzled at the lack of effect.
I find that everything fits together if I think of
svn merge as a synonym for
svn repeat. You’re asking for the changes between two revisions to be applied to the current working copy.
svn merge branches/coolfeature trunk doesn’t do anything because it doesn’t describe any changes.
What’s required is
svn merge branches/coolfeature@73 branches/coolfeature@HEAD, which takes the changes made to the coolfeature branch between revision 73 and the latest revision, and applies them to the working copy you’re currently in.
(It’s much shorter to write this as:
svn merge -r 73:HEAD branches/coolfeature)
The awkward bit is finding out when you should start merging from (the “73” in my example). To do this you have to read the logs and find either the revision where you created the branch or the last revision you merged from, whichever is more recent.
All this should become irrelevant shortly, though. Subversion 1.5 (according to an aside in this developer blog post) will automatically track much merge metadata so the requirement to specify revision ranges of changes to merge should be eliminated in the common case. I look forward to it.
That’s why the online svnbook (chapter 4) specifically says, “you shouldn’t think of svn merge as merging FROM->TO, but rather as ‘make a diff between the arguments and apply it’. 🙂
I’m going to make the embarrassing admission that I largely picked up SVN by playing with TortoiseSVN, and even now have only selectively read the book.
Leave a comment