[Svnmerge] [PATCH 1/2] fix test failures from r22788

[Dustin J. Mitchell]

This patch fixes the test failures by avoiding the issue; second patch
tests the new functionality.

If there's no feedback in a few days, I'll just commit this.

Dustin

-- 
        Dustin J. Mitchell
        Storage Software Engineer, Zmanda, Inc.
        http://www.zmanda.com/
-------------- next part --------------
[[[
* contrib/client-side/svnmerge/svnmerge_test.py: fix testUninit,
  testBidirectionalMerges, and testBidirectionalMergesMultiBranches,
  which began failing in r22788, by forcing revisions at 'init' time
  and ignoring '--force' in the 'svn merge' commands generated by
  'svnmerge merge'.
]]]
Index: fix-tests/svnmerge_test.py
===================================================================
--- fix-tests.orig/svnmerge_test.py	2007-06-28 00:33:17.235640243 -0500
+++ fix-tests/svnmerge_test.py	2007-06-28 00:48:57.083578805 -0500
@@ -591,7 +591,7 @@
         os.chdir("trunk")
         # Not using switch, so must update to get latest repository rev.
         self.launch("svn update", match=r"At revision 13")
-        self.svnmerge2(["init", self.test_repo_url + "/branches/test-branch"])
+        self.svnmerge2(["init", self.test_repo_url + "/branches/test-branch", "-r1-13"])
         self.launch("svn commit -F svnmerge-commit-message.txt",
                     match=r"Committed revision 14")
 
@@ -727,7 +727,7 @@
 
         # Not using switch, so must update to get latest repository rev.
         self.launch("svn update", match=r"At revision 14")
-        self.svnmerge2(["init", self.test_repo_url + "/branches/test-branch"])
+        self.svnmerge2(["init", self.test_repo_url + "/branches/test-branch", "-r1-14"])
         self.launch("svn commit -F svnmerge-commit-message.txt",
                     match=r"Committed revision 15")
         os.remove("svnmerge-commit-message.txt")
@@ -745,8 +745,8 @@
         # Not using switch, so must update to get latest repository rev.
         self.launch("svn update", match=r"At revision 16")
 
-        self.svnmerge("avail -vv --bidirectional", match=r"16$")
-        self.svnmerge("merge -vv --bidirectional", match=r"merge -r 15:16")
+        self.svnmerge("avail -vv --bidirectional", match=r"\n16$")
+        self.svnmerge("merge -vv --bidirectional", match=r"svn merge --force -r 15:16")
         p = self.getproperty()
         self.assertEqual("/trunk:1-16", p)
         self.svnmerge("integrated", match=r"^3-16$")
@@ -767,12 +767,12 @@
         self.launch("svn update", match=r"At revision 18")
 
         # Ensure default is not to check for reflected revisions.
-        self.svnmerge("avail -vv", match=r"17-18$")
+        self.svnmerge("avail -vv", match=r"\n17-18$")
 
         # Now check reflected revision is excluded with --bidirectional flag.
-        self.svnmerge("avail -vv --bidirectional", match=r"18$")
+        self.svnmerge("avail -vv --bidirectional", match=r"\n18$")
 
-        self.svnmerge("merge -vv --bidirectional", match=r"merge -r 17:18")
+        self.svnmerge("merge -vv --bidirectional", match=r"svn merge --force -r 17:18")
         p = self.getproperty()
         self.assertEqual("/branches/test-branch:1-18", p)
 
@@ -790,7 +790,7 @@
 
         os.chdir("test-branch")
 
-        self.svnmerge2(["init", self.test_repo_url + "/trunk"])
+        self.svnmerge2(["init", self.test_repo_url + "/trunk", "-r1-13"])
         self.launch("svn commit -F svnmerge-commit-message.txt",
                     match=r"Committed revision 15")
         os.remove("svnmerge-commit-message.txt")
@@ -798,7 +798,7 @@
         os.chdir("..")
         os.chdir("test-branch2")
 
-        self.svnmerge2(["init", self.test_repo_url + "/trunk"])
+        self.svnmerge2(["init", self.test_repo_url + "/trunk", "-r1-14"])
         self.launch("svn commit -F svnmerge-commit-message.txt",
                     match=r"Committed revision 16")
         os.remove("svnmerge-commit-message.txt")
@@ -809,11 +809,11 @@
         # Not using switch, so must update to get latest repository rev.
         self.launch("svn update", match=r"At revision 16")
 
-        self.svnmerge2(["init", self.test_repo_url + "/branches/test-branch"])
+        self.svnmerge2(["init", self.test_repo_url + "/branches/test-branch", "-r1-16"])
         self.launch("svn commit -F svnmerge-commit-message.txt",
                     match=r"Committed revision 17")
         os.remove("svnmerge-commit-message.txt")
-        self.svnmerge2(["init", self.test_repo_url + "/branches/test-branch2"])
+        self.svnmerge2(["init", self.test_repo_url + "/branches/test-branch2", "-r1-17"])
         self.launch("svn commit -F svnmerge-commit-message.txt",
                     match=r"Committed revision 18")
         os.remove("svnmerge-commit-message.txt")
@@ -834,7 +834,7 @@
 
         # Merge into trunk
         self.svnmerge("merge -vv -S branch2",
-                      match=r"merge -r 18:19")
+                      match=r"merge --force -r 18:19")
         p = self.getproperty()
         self.assertEqual("/branches/test-branch:1-16 /branches/test-branch2:1-19", p)
 
@@ -855,7 +855,7 @@
         # should be available for test-branch with --bidirectional flag.
         self.svnmerge("avail -vv --bidirectional", match=r"20$")
 
-        self.svnmerge("merge -vv --bidirectional", match=r"merge -r 17:20")
+        self.svnmerge("merge -vv --bidirectional", match=r"merge --force -r 17:20")
         p = self.getproperty()
         self.assertEqual("/trunk:1-20", p)