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

Re: Meaning of "merge --ignore-ancestry"

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Thu, 27 Mar 2008 23:37:54 -0400

Julian Foad <julianfoad_at_btopenworld.com> writes:
> My recent thread "[PATCH] Help text improvements for 'svn merge'"
> includes the following clarification to the help text:
>
>> " NOTE: Subversion will only record metadata to track the merge\n"
>> " if the two sources are on the same line of history -- if the\n"
>> " first source is an ancestor of the second, or vice-versa. This is\n"
>> " guaranteed to be the case when using the third form listed above.\n"
>> + " The --ignore-ancestry option overrides this, forcing Subversion to\n"
>> + " regard the sources as unrelated and not to track the merge.\n"),
>
> -------------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^
>
> This is based on my understanding after talking with pburba and cmpilato.

Okay, thanks. I think that will clarify things for a lot of users (not
just me :-) ).

(Someday we still might want a separate --no-record option... but not
for 1.5.0!)

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-28 04:38:16 CET

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