svn revert after merge

Question

I\'ve done an svn merge between two branches -- not checked in -- and now I want to \"un-merge\" some of the files in my working copy. Something like the following:

Answer 1

It appears you want to merge by cherry-picking, which is a hack at best, in SVN. You'll need to become an svn merge expert to pull this off. Other version control systems (hg, darcs, bzr) support this method of development better, but come with their own warts. So, pick your poison and get used to it.