[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: <cmpilato_at_collab.net>
Date: 2003-08-22 19:45:52 CEST

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

> 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

Um, get an updated client, homey.

$ svn help merge | grep notice
  --notice-ancestry : notice ancestry when calculating differences

---------------------------------------------------------------------
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:49:40 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.