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

Re: Merge fails to merge two successive changes of the same property

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 08 Sep 2008 18:27:40 +0100

On Fri, 2008-09-05 at 20:12 +0300, Kari Grano wrote:
> Julian Foad writes:
> > Here is another problem I had when merging recently, and this one is
> > also unrelated to merge tracking, though it showed up for me first in a
> > merge tracking merge.
> > svn 1.5.2 fails to merge a property change if it breaks the merge into
> > two phases (each of which contained a change to that property in the
> > source branch) as part of its merge-tracking algorithm. It complains
> > that the property is "locally modified" when it tries to apply the
> > second modification.
> Hi Julian,
> This sounds like another instance of
> http://subversion.tigris.org/issues/show_bug.cgi?id=3250.

Thanks for the pointer, Kari. It is a similar but different problem.

That issue is about two successive changes to the same property, with
conflicts. My test is for a simpler situation: two successive changes
that should not conflict.

- Julian

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-08 19:27:34 CEST

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.