Re: Merging confuses renamed files

John Goerzen <jgoerzen@complete.org> writes:

> My question is: why? Subversion has enough information to duplicate
> the upstream changes locally, but doesn't. It appears to be behaving
> as if --ignore-ancestry was given to merge, but it wasn't.
>
> Can anybody shed some light on this?

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?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 22 17:45:59 2003