[Svnmerge] Test failures from

[Daniel Rall]

Blair, the patch you committed from Larry in r22788 causes three test
failures:

$ ./svnmerge_test.py TestCase_TestRepo.testBidirectionalMerges \
                     TestCase_TestRepo.testBidirectionalMergesMultiBranch \
                     TestCase_TestRepo.testUninit
FFF
======================================================================
FAIL: Check that reflected revisions are recognized properly for bidirectional merges.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "./svnmerge_test.py", line 740, in testBidirectionalMerges
    self.svnmerge("integrated", match=r"^13-14$")
  File "./svnmerge_test.py", line 180, in svnmerge
    return self.svnmerge2(cmds.split(), *args, **kwargs)
  File "./svnmerge_test.py", line 210, in svnmerge2
    "pattern %r not found in output:\n%s" % (match, out.getvalue()))
AssertionError: pattern '^13-14$' not found in output:


======================================================================
FAIL: Check that merges from a second branch are not considered reflected for other branches.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "./svnmerge_test.py", line 837, in testBidirectionalMergesMultiBranch
    match=r"merge -r 18:19")
  File "./svnmerge_test.py", line 180, in svnmerge
    return self.svnmerge2(cmds.split(), *args, **kwargs)
  File "./svnmerge_test.py", line 210, in svnmerge2
    "pattern %r not found in output:\n%s" % (match, out.getvalue()))
AssertionError: pattern 'merge -r 18:19' not found in output:
svn propget --strict "svnmerge-integrated" "."
svnmerge: calculate source path for the branch
svn info "."
svn info "file:///tmp/__svnmerge_test/repo/branches/test-branch2"
svnmerge: source is "file:///tmp/__svnmerge_test/repo/branches/test-branch2"
svnmerge: checking status of "."
svn status -q .
svn info "file:///tmp/__svnmerge_test/repo/trunk"
svn log --quiet -r14:19 "file:///tmp/__svnmerge_test/repo/branches/test-branch2"
svn propget --strict "svnmerge-blocked" "."
svnmerge: memorizing phantom revision(s): 15,17-18
svnmerge: merging in revision(s) 14,16,19 from "file:///tmp/__svnmerge_test/repo/branches/test-branch2"
svn propget -r 13 --strict "svnmerge-integrated" "file:///tmp/__svnmerge_test/repo/branches/test-branch2"
svn merge -r 13:19 file:///tmp/__svnmerge_test/repo/branches/test-branch2 .
U    test1
 C   .

svn log --incremental -r14 file:///tmp/__svnmerge_test/repo/branches/test-branch2
svn log --incremental -r16 file:///tmp/__svnmerge_test/repo/branches/test-branch2
svn log --incremental -r19 file:///tmp/__svnmerge_test/repo/branches/test-branch2
svnmerge: wrote commit message to "svnmerge-commit-message.txt"
svnmerge: property data written to temp file: /branches/test-branch:1-6 /branches/test-branch2:1-19
svn propset "svnmerge-integrated" -F "/tmp/tmpUC4q_t" "."
property 'svnmerge-integrated' set on '.'



======================================================================
FAIL: Test that uninit works, for both merged and blocked revisions.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "./svnmerge_test.py", line 643, in testUninit
    self.assertEqual("/branches/test-branch:1-13", pmerged)
AssertionError: '/branches/test-branch:1-13' != '/branches/test-branch:1-6'

----------------------------------------------------------------------
Ran 3 tests in 33.911s

FAILED (failures=3)