[Svnmerge] [PATCH] Handle transitive merging propertyconflictsforbothmerged/blockedrevs

[Michael Willmott]

Raman Gupta wrote:
> Does that test fail in your environment? It passes in mine:

The test as written passes.  This patch exposes the bug and fails.

Index: svnmerge_test.py
===================================================================
--- svnmerge_test.py    (revision 25978)
+++ svnmerge_test.py    (working copy)
@@ -591,8 +591,8 @@
              match=r"Committed revision 16")

          os.chdir("../test-branch")
-        self.svnmerge("block -r 16")
-        self.launch('svn ci -m "block r16"',
+        self.svnmerge("merge -r 16")
+        self.launch('svn ci -m "merge r16"',
              match=r"Committed revision 17")

          #os.chdir("../test-branch")

-- 
Michael Willmott