[Svnmerge] [PATCH] Transitive merge fix

[Raman Gupta]

Patch attached for review:

[[[
Properly handle merge/block property conflicts when doing
transitive merging i.e. A -> B -> C.

* svnmerge.py:
  (get_merge_props),
  (get_block_props): Allow passing an optional rev argument.
  (action_merge): Before each merge, preset the merge and blocked
    property values to the merge left values. This prevents any
    chance of conflicts during the merge.

* svnmerge_test.py:
  (testTransitiveMergeWithBlock): Renamed from testTransitiveMerge.
    Added a test at the end for the merge property value.
  (testTransitiveMerge): New test that actually carries a merge
    through from A -> B -> C instead of blocking it.

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

Cheers,
Raman
-------------- next part --------------
A non-text attachment was scrubbed...
Name: svnmerge_transitive_fix.patch
Type: text/x-patch
Size: 4091 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070808/c096ec6c/attachment-0002.bin>