subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "C. Michael Pilato" <cmpil...@collab.net>
Subject Re: Ancestrally Related Error Message
Date Mon, 17 Jun 2013 15:38:16 GMT
On 06/17/2013 11:19 AM, C M wrote:
> 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?

Subversion doesn't think there is.  Rather, it knows there isn't.  Hence the
message.  The error was introduced to prevent a common mistake folks make
when they misalign their merge sources and targets:

   $ svn merge ^/trunk branches
   ^C^C^Cdangit i meant to type "branches/my-branch"^C^Caaaaagh!

> Two, how can I do to get around this error message?

Well... the --ignore-ancestry option was *supposed* to make that happen for
you.  Perhaps there's a bug?

You may need to give a more complete transcript of what you're trying,
including command-line examples and such.

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development


Mime
View raw message