Merge fails to merge two successive changes of the same property

[Julian Foad <ju...@btopenworld.com>]

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.

Demonstration, showing how the same problem is present with manual
merges without a commit in between:

$ svn propset p 'A' A/mu
$ svn commit               # r7
$ svn propset p 'B' A/mu
$ svn commit               # r8

$ svn merge -c7 A/ A_COPY/
--- Merging r7 into 'A_COPY':
 U   A_COPY/mu

$ svn merge -c8 A/ A_COPY/
--- Merging r8 into 'A_COPY':
 C   A_COPY/mu


I have written a test for this: it is merge_tests.py 106, marked XFail.

I will look at fixing this as it is similar to a situation I've already
been dealing with for file text content in tree conflict handling. It
should be easy.

- Julian



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org