Re: Merging confuses renamed files

On Fri, Aug 22, 2003 at 10:41:48AM -0500, cmpilato@collab.net wrote:
> 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?

If not, then the help message should be fixed.

  --notice-ancestry : ignore ancestry when calculating differences

--ben

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 22 19:46:24 2003