Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

SVN - Reintegration Merge error: "must be ancestrally related"

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?

like image 949
Seibar Avatar asked Jan 29 '09 01:01

Seibar


1 Answers

I just went through a similar problem, wanted to add the issue and solution I hit. The branch was made from a SUBFOLDER of trunk and not the entire tree. Thus, when I tried to reintegrate, I was mismatching hierarchies. Simply restructuring the integrate to be to the proper subfolder of my trunk WD allowed the process to proceed.

Adding in hopes this might aid someone who hits this Q/A. :)

like image 161
davebytes Avatar answered Oct 08 '22 22:10

davebytes