Rev 4633: Merge working tree basis fix for 2a. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4633 [merge]
revision-id: robertc at robertcollins.net-20090817070009-b2dnb0vobtk5j66l
parent: robertc at robertcollins.net-20090817065152-zf0murnceu4x2n4g
parent: robertc at robertcollins.net-20090817065822-t8nwiaa7igjkcvxt
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Mon 2009-08-17 17:00:09 +1000
message:
  Merge working tree basis fix for 2a.
modified:
  bzrlib/tests/per_workingtree/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
=== modified file 'bzrlib/tests/per_workingtree/test_basis_inventory.py'
--- a/bzrlib/tests/per_workingtree/test_basis_inventory.py	2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_workingtree/test_basis_inventory.py	2009-08-17 06:58:22 +0000
@@ -49,7 +49,7 @@
         self.assertEquals('r1', basis_inv.revision_id)
 
         store_inv = b.repository.get_inventory('r1')
-        self.assertEquals(store_inv._byid, basis_inv._byid)
+        self.assertEqual([], store_inv._make_delta(basis_inv))
 
         open('b', 'wb').write('b\n')
         t.add('b')
@@ -62,7 +62,7 @@
         self.assertEquals('r2', basis_inv.revision_id)
         store_inv = b.repository.get_inventory('r2')
 
-        self.assertEquals(store_inv._byid, basis_inv._byid)
+        self.assertEqual([], store_inv._make_delta(basis_inv))
 
     def test_wrong_format(self):
         """WorkingTree.basis safely ignores junk basis inventories"""