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

[Karl Fogel <kf...@red-bean.com>]

Julian Foad <ju...@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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org