SVN merge loses files and code

Question

Hi.

I'm trying to merge trunk change-set into a branch, but have found out a lot of post-merge issues, including whole files that disappeared, and missing code blocks

I'm using SVN 1.6 for both clients and server. Tried this with multiple clients - Eclipse, Netbeans and SVN - the result is the same.

Can someone advice how sort it out, and most important, prevent code loss?

Thanks in advance!

Answer 1

I'm not sure what your issue is, but svn generally shouldn't lose anything unless you tell it to. When in doubt, save an "svn diff" off to a file somewhere outside your repository until your changes are checked in as you wish.

Answer 2

In the end, I used the CollabNet merge client which did the job automatically.

Apparently it was a clear case of me missing the revision numbers multiple times.