Rev 4618: Merge fix for test_foreign with 2a. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

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

------------------------------------------------------------
revno: 4618 [merge]
revision-id: robertc at robertcollins.net-20090814043613-ybkxf0ie25h9wli9
parent: robertc at robertcollins.net-20090814041346-x7dcki8tcgndkjh2
parent: robertc at robertcollins.net-20090814043032-008xgmj4axr8yi23
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Fri 2009-08-14 14:36:13 +1000
message:
  Merge fix for test_foreign with 2a.
modified:
  bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
=== modified file 'bzrlib/tests/test_foreign.py'
--- a/bzrlib/tests/test_foreign.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/test_foreign.py	2009-08-14 04:30:32 +0000
@@ -309,6 +309,7 @@
         self.build_tree_contents([('br1/bla', 'original contents\n')])
         wt.add('bla', 'bla-a')
         wt.commit('bla-a')
+        root_id = wt.get_root_id()
         target = wt.bzrdir.sprout('br2').open_workingtree()
         target.unversion(['bla-a'])
         target.add('bla', 'bla-b')
@@ -319,7 +320,7 @@
         foreign.update_workingtree_fileids(wt, target_basis)
         wt.lock_read()
         try:
-            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
+            self.assertEquals([root_id, "bla-b"], list(wt.inventory))
         finally:
             wt.unlock()