Re: Merging confuses renamed files

mark benedetto king <mbk@lowlatency.com> writes:

>> Um ... Ben and I, kinda, made --ignore-ancestry the default. It's now
>> --notice-ancestry. But the other day, Ben started having second
>> thoughts, and now I am, too. Should this be reverted?
>
> If not, then the help message should be fixed.
>
> --notice-ancestry : ignore ancestry when calculating differences

I am using 0.26.0, and svn merge --help does not mention
--notice-ancestry at all. It only lists --ignore-ancestry. Was the
change in that version lacking the corresponding change to the help
text, or have I found a different bug here?

-- John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 22 20:00:11 2003