SVN merge loses files and code

Question

I am trying to merge changes in trunk into a branch, but I found many problems after merging, including missing whole files and missing code blocks

I use SVN 1.6 for clients and server. Tried this with several clients - Eclipse, Netbeans and SVN - the result is the same.

Can someone advise how to sort it, and most importantly, prevent code loss?

Thanks in advance!

Answer 1

In the end, I used the CollabNet federation client, which automatically completed the task.

Apparently, this was a clear case when I skipped version numbers several times.

Answer 2

, , svn , . , "svn diff" - , , .