[Svnmerge] [PATCH] Eliminate spurious svnmerge-integrated property conflicts

[Raman Gupta]

Sometimes, svnmerge.py will cause spurious conflicts in the merge
memory property. The last step of the action_merge function sets this
property explicitly to the new correct value anyway, so any conflicts
that occurred during the merge are irrelevant.

The patch for this is attached, and all tests still pass. Here is the
log message:

[[[
Prevent spurious conflicts on the merge property when the
source branch contains merge property information for other
branches. Previously, this caused a property conflict (when
-b was not used) because the initial value on the source branch
did not match the initial value on the target branch.

* contrib/client-side/svnmerge.py:
  (action_merge): Before each merge, set the merge property
    explicitly to the initial value of the source branch in
    all cases instead of only when bidirectional merging is
    enabled.

Patch by:  Raman Gupta <rocketraman at fastmail.fm>
Review by: ?
]]]

Cheers,
Raman
-------------- next part --------------
A non-text attachment was scrubbed...
Name: propconflict.patch
Type: text/x-patch
Size: 1016 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20061006/832aa272/attachment-0002.bin>