SVN - Merge with reintegration error: "must be system related"

Using TortoiseSVN - when I use Test Merge, I get the error " http: // mysvnserver / svn / main / branches / ProjectA should be associated with http: // mysvnserver / svn / main / trunk / ProjectB "

What can I do to solve this problem?

+54
svn tortoisesvn
Jan 29 '09 at 1:24
source share
9 answers

I just went through a similar problem, wanted to add the problem and solution that I hit. The branch was made of the SUBSODNIK trunk, and not the whole tree. Thus, when I tried to reintegrate, I did not fit the hierarchies. Just restructuring the integration for the corresponding subfolder of my WD trunk allowed the process to continue.

Adding hope, this can help someone who falls into this Q / A. :)

+64
Jun 08 2018-11-18T00:
source share

Let me guess: are the projects unrelated? See the story if one of them has ever been branched or not.

Immediate solution: either merge into the hand, or try a command line with "svn merge --ignore-ancestry"

+16
Jan 29 '09 at 1:33
source share

As davebytes mentioned, this problem can occur if you type trunk\X in branches\Y and then move X to a new folder Z , i.e. trunk\X\Z

If you just try to merge the change on branches\Y to trunk\X , you will have many conflicts; if you just try to merge branches\Y into trunk\X\Z , you will get the error message "ancestrally related".

But, the SVN manual describes the main problem : svn merge really should be called svn diff-and-apply . What you should try to describe in this scenario is that you are trying to summarize the changes from r100 to r200 branches\Y and apply these changes to trunk\X\Z\ .

In TortoiseSVN, this is a scenario for merging two different trees with your local working copy trunk\X\Z , where r100 from branches\Y set to "from" and r200 of branches\Y set to "from".

+7
Apr 19 '12 at 23:32
source share

We encountered this problem due to the following:

Created a folder with the TortoiseSVN repo browser and used it as a branch. Subsequently, we tried to merge the manually created folder into a working folder.

Solution: Do not manually create the branch in the first place, use the TortoiseSVN → Branch / tag ... option instead to create the branch.

Hope this will be helpful.

+4
Mar 05 '14 at 16:21
source share

First, I tried to merge into the root folder and got an error, then I looked at the specific folder in which I wanted to merge, and then I selected the desired folder to merge.

Example

In my branch I have a project structure:

  -Root - Code - DB 

I created a tag and was changed to a DB tag folder. Now I want to make tag changes to the branch. So, I switched to my branch and tried to unite and got the error "must be connected with it."

So the solution was,

 I browsed to "DB" folder in branch, right click and select Tortoise SVN->Merge-> Merge a range of revisions -> 

Now, from the URL to merge, I have selected:

 the "DB" folder from my tag. Then, "test branch". Everything worked fine :D 

So, I clicked the "Merge" button.

+2
Feb 27 '17 at 11:18
source share

This error may occur if you have a file named exactly as one of the branches (or trunk):

 # svn switch ^/trunk Updated to revision 123. # ls file1 file2 v1 # svn merge --reintegrate ^/branches/v1 svn: E195016: ^/branches/v1@123 must be ancestrally related to ^/trunk/v1@123 

To solve this problem, add the current directory to the command (note the point):

 # svn merge --reintegrate ^/branches/v1 . 

This is an example of real life, it cost me a couple of very unpleasant hours. :(

+1
Jun 25 '15 at 16:36
source share

I merged with another project. Raised this question. I merged with the correct branch, then it worked fine. My bad, dyslexia

0
Jul 08 '15 at 18:40
source share

I had the same error and the reason was the resolution.

The problem was that one developer is trying to integrate changes from one branch to which he has read / write access to another, which he also has read / write access to, but the latter is a branch created from another branch, in which he simply has read access.

Here is the structure with permissions (r = read, w = write):

trunk (r) develop (r) QA (rw) branch featureBranch1 (rw)

In this case, development was created from the backbone, QA from development, and featureBranch1 from development. The fact that he is trying to reintegrate featureBranch1 into QA, which was a branch created from development, and he does not have write access to development, in our case is the problem why he gets this message when trying to reintegrate featureBranch1 into QA.

Immediately after giving him access to the development record, the message disappears.

0
May 17 '17 at 14:42
source share

I had the same problem. I fixed it correctly cd on which I merged. I merged in the path directory so that the project is not in the trunk path directory (which is the actual ancestor).

0
Nov 24 '17 at 16:53 on
source share



All Articles