views:

2343

answers:

1

Using TortoiseSVN - when I use Test Merge, I get the error "http://mysvnserver/svn/main/branches/ProjectA must be ancestrally related to http://mysvnserver/svn/main/trunk/ProjectB"

What can I do to resolve this?

+5  A: 

Let me guess: the projects are not related? Look up the history, if one of them ever was branched or not.

Immediate solution: either merge per hand or try command line with "svn merge --ignore-ancestry"

Leonidas