[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: Kari Grano <kari.grano_at_gmail.com>
Date: Fri, 5 Sep 2008 20:12:16 +0300

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.

Regards,
Kari

---------------------------------------------------------------------
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-05 19:11:35 CEST

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