Svn Merge from Trunk to Branch

Every time I need to do this I try to use svn's --help which is only possible to decipher if you already know what to do. Then I spend too much time on the internet looking for the answer. And finally I break down and ask my tech lead. With much shame. I'm putting this up here so I least I'll know where to find it. Maybe you too.

In the directory of the branch:

svn merge -r 1001:1002 https://svn.dev.your/repo/trunk/src .

If you checked in some files in revision 1002, then what you're saying is that you only want the changes from that checkin with '-r 1001:1002' Which is followed by the url of the trunk (where the changes were checked in) and a '.' to say that you want to merge to the current directory. Use '--dry-run' if you want to see what would happen without actually screwing anything up. After the merge is successful, you now have some modified files in the branch you can check in.

Done and done.

Comments

Josh Price said…
Until SVN 1.5 is released (http://blogs.open.collab.net/svn/2007/10/subversion-15-m.html) you might want to use svnmerge.py (http://www.orcaware.com/svn/wiki/Svnmerge.py).

I'm not sure how I ever lived without a tool like this for managing branches.
January 8, 2008 at 4:33 AM
Anonymous said…
I've found that merging more than 10 revisions to be problematic for the merge process.

Here's a nugget if you are merging from a revision number to the current version:
svn merge -r 1001:HEAD https://svn.dev.your/repo/trunk/src .
January 8, 2008 at 8:18 AM
Anonymous said…
You can also use a working copy instead of the URL, which can be easier:

svn merge -r 1001:1002 ../path/to/trunk .
January 11, 2008 at 11:06 AM
Anonymous said…
exactly what i was looking for. fantastic!
July 11, 2008 at 4:26 AM
Jeremy said…
I've gone back to this post over and over the past 6 months, so thanks!
August 26, 2009 at 1:58 PM
Ravi said…
what if I need to pickup a couple of revisions at a time from the trunk and merge in the changes to my branch? Will this work:

svn merge -r 1001:1005 ../path/to/trunk .

thanks,
Ravi
May 9, 2010 at 11:29 PM
Anonymous said…
It's 2012 now. Still done and done. Thanks.
January 7, 2012 at 1:26 PM
Dave said…
Just what I needed — saved me a lot of pain.

Cheers Jake!
January 20, 2012 at 7:57 AM
dhs said…
Still use this as a reminder every time I merge. Thanks.
January 8, 2015 at 10:51 AM
Anonymous said…
Wonderful! Thanks - You just saved tons of hours of internet look-up (and the same type embarrassment you mentioned) for me.
October 5, 2015 at 11:25 AM
Post a Comment

Popular posts from this blog

What's a Good Flog Score?

I've been using Flog to measure the complexity of my Ruby code and I was wondering how others interpret Flog numbers. I'll go first with my opinions: Score of Means 0-10 Awesome 11-20 Good enough 21-40 Might need refactoring 41-60 Possible to justify 61-100 Danger 100-200 Whoop, whoop, whoop 200 + Someone please think of the children (note: these are scores for an individual method) The 20 - 60 range is interesting to me. Sometimes the complexity of what you're doing will justify the score and other times the method is in desperate need of refactoring. The highest Flog score I've seen in the wild was in the 300's. What's you're personal high and what do you think of my rankings? In other news, I've redesigned the look of my blog so if you only see my post through a reader you might want to stop on by, take a look, and tell me what you think.
Read more

SICP Wasn’t Written for You

The number of software luminaries who sing the praises of “ Structure and Interpretation of Computer Programs ” (referred to as SICP) is such a long list that you might think only a crazy person would take issue with it. However, to ignore SICP’s problems and continue to blindly recommend it seems just as crazy. SICP was the textbook for MIT’s introductory programming class and was a bit of a departure from other into to computer science textbooks at the time.  Wikipedia sums it up nicely:  “Before SICP, the introductory courses were almost always filled with learning the details of some programming language, while SICP focuses on finding general patterns from specific problems and building software tools that embody each pattern.”  Which sounds awesome, but does essentially say that abstract principles will be introduced before the nuts and bolts of a language.  If you think about that for a minute, you may see where the problems will be. When I was training to be a...
Read more

Point Inside a Polygon in Ruby

Recently my team needed to find out if a point was inside a given polygon and, as usual, we found some code on the internet that did what we wanted. And, as usual, there wasn't much explanation as to what it was doing. Here's the code (after we converted it to Ruby): 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 def contains_point? (point) c = false i = -1 j = self .size - 1 while (i += 1 ) < self .size if (( self [i].y <= point.y && point.y < self [j].y) || ( self [j].y <= point.y && point.y < self [i].y)) if (point.x < ( self [j].x - self [i].x) * (point.y - self [i].y) / ( self [j].y - self [i].y) + self [i].x) c = !c end end j = i end return c end end So, you know, it works and I'm grateful to somebody for posting it but we had no idea how it works. So we wrapped 2 tests around it (one where the point is not in the polygon and another where it is...
Read more