Wednesday, February 24, 2010

svn merging is easy...

Subversion(svn) merging is easy... iff you are using a modern svn version (1.6.x).
Here it is in short:

$ cd /dir/of/your-branch
$ svn merge ^/trunk
Where ^/trunk is the url of the branch you want to merge from. For more details, have a look in the svn book basic merging section.

Also this article on svn merging explains it fairly well.

The svn 1.6 release notes and 1.5 release notes also talk about various svn updates including merge enhancements amongst other goodies (like improved python bindings).

Really, merging is not too bad in subversion now. I know this post won't stop everyone from using 2004 reasons arguing over version control systems... but what ever.

Ok, bzr, hg, and git all have lots of nice features - but merging in svn is pretty easy now so please bash(zsh) it for other reasons if you must.

Now, let's move back to the vi VS emacs argument ;)

5 comments:

Masklinn said...

What does the history (log) look like after this svn merge?

illume said...

hi,

it shows the svn log history here:

http://www.javaworld.com/javaworld/jw-01-2008/jw-01-svnmerging.html?page=3

cheers,

oscar said...

vi is obviously better. Did I miss your point? :)

illume said...

yeah for sure. Definitely vi ;)

Stephan Deibel said...

I use svnmerge, which adds a few things. May be worth looking at also. In any case, I agree merging is easy in svn.