Rev 4328: Update static rich root test to support new, reconcile-compatible algorithm. in http://people.ubuntu.com/~robertc/baz2.0/pending/bug-368921

Robert Collins robertc at robertcollins.net
Wed May 6 03:23:05 BST 2009


At http://people.ubuntu.com/~robertc/baz2.0/pending/bug-368921

------------------------------------------------------------
revno: 4328
revision-id: robertc at robertcollins.net-20090506022253-dixnd5lihmrzlkfk
parent: robertc at robertcollins.net-20090506010425-xhwhcfs6piriclyc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-368921
timestamp: Wed 2009-05-06 12:22:53 +1000
message:
  Update static rich root test to support new, reconcile-compatible algorithm.
=== modified file 'bzrlib/tests/test_fetch.py'
--- a/bzrlib/tests/test_fetch.py	2009-05-01 07:59:02 +0000
+++ b/bzrlib/tests/test_fetch.py	2009-05-06 02:22:53 +0000
@@ -578,8 +578,7 @@
         self.repo.fetch(self.tree.branch.repository, 'second-id')
         root_id = self.tree.get_root_id()
         self.assertEqual(
-            ((root_id, 'left-parent'), (root_id, 'ghost-parent'),
-             (root_id, 'not-ghost-parent')),
+            ((root_id, 'left-parent'), (root_id, 'not-ghost-parent')),
             self.get_parents(root_id, 'second-id'))
 
     def make_two_commits(self, change_root, fetch_twice):




More information about the bazaar-commits mailing list