Subversion can't merge after a move

Question

I\'m very new to Subversion, but I\'ve used other revision control systems like ClearCase for years.

My boss asked me to fix this project so that it could be built w

Answer 1

I just had the same problem and I solved it with git. I didn't want to merge serveral modules with svn merge -r N:M http://server/branch/foo/test/com src/test/java/com for src/main, src/test and resources.

So I used git svn clone file:///some/repo -T trunk -b branches -t tags. Like this I was able to keep git master in sync with svn trunk and merge it with my git branch. When I was done, I merged the git branch to git master and from there to svn trunk.