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

RE: Merging confuses renamed files

From: Sander Striker <striker_at_apache.org>
Date: 2003-08-22 20:54:25 CEST

> From: cmpilato@localhost.localdomain
> [mailto:cmpilato@localhost.localdomain]On Behalf Of cmpilato@collab.net
> Sent: Friday, August 22, 2003 5:42 PM

> 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?

Yes.

We should have at least two options: --ignore-ancestry and --notice-ancestry.
And it would be nice to have this option in the config file too, so
you can set your personal default to one and use the rarer case (for you)
via a cmdline override.

Sander

---------------------------------------------------------------------
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:55:30 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.