[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Ancestrally Related Error Message

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Mon, 17 Jun 2013 15:24:49 +0000

> Hello,
> Code for a new development effort was imported into a developer's branch.
> Now we want merge his changes to trunk (which is currently empty).
> I tried the merge from both the command line and the Tortoise GUI and keep
> running into the "...must be ancestrally related..." message.I also tried the
> "ignore ancestry" option via the GUI.
> One, I don't understand why SVN thinks there is even an ancestral relationship
> betweeen the two locations?
> Two, how can I do to get around this error message?

From your message I assume that your "branch" install a copy of your trunk, hence not "ancestrally related".

It "thinks" there is a relationship because you are doing a merge. I'm not sure why the "ignore ancestry" doesn't solve the issue though.

Since trunk is empty... why not just delete trunk and copy that branch to trunk?

Received on 2013-06-17 17:25:22 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.