Index ¦ Archives ¦ RSS

Merging in subversion

Estimated read time: 1 minutes

I'm just talking about 1.5+, since before that version it's like there would be not git merge, just git cherry-pick. (You had to explicitly specify each revision. That's not merging.)

A quick howto is here.

A command which may be useful but left out is like 'git log master..branch', to see what revisions will be merged:

$ time svn mergeinfo \
--show-revs eligible
real    0m14.902s
user    0m0.155s
sys     0m0.013s

Well, it's getting better, but as the blog post says it's still not git-like.

Actually it's horribly slow, I'm still waiting for 'svn merge' to finish. ;-)

© Miklos Vajna. Built using Pelican. Theme by Giulio Fidente on github.