Merge another test fix.

diff --git a/tests/test_push.py b/tests/test_push.py
index c7e0da5fd189ddaecb22874ac3652807cefe35de..33f058f4a6fdfcf545d6d7a27206d9cab3d40dc6 100644 (file)
--- a/tests/test_push.py
+++ b/tests/test_push.py
@@ -736,7 +736,7 @@ class PushNewBranchTests(TestCaseWithSubversionRepository):
         bzrwt.add_pending_merge(merge_revid)
         self.assertEquals(bzrwt.get_parent_ids()[1], merge_revid)
         revid2 = bzrwt.commit("Merge something", rev_id="mergerevid")
-        bzr_parents = bzrwt.branch.repository.revision_parents(revid2)
+        bzr_parents = bzrwt.branch.repository.get_revision(revid2).parent_ids
         trunk = Branch.open(repos_url + "/trunk")
         trunk.pull(bzrwt.branch)
 
@@ -746,7 +746,7 @@ class PushNewBranchTests(TestCaseWithSubversionRepository):
         self.assertEquals([revid1, revid2], trunk.revision_history())
         self.client_update("dc")
         self.assertEquals(
-                '1 initialrevid\n',
+                '1 initialrevid\n2 mergerevid\n',
                 self.client_get_prop("dc/trunk", SVN_PROP_BZR_REVISION_ID+"trunk0"))