Rev 4731: merge the test fix in http://bazaar.launchpad.net/~jameinel/bzr/2.0.4-dirstate-set-root-504390

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0.4-dirstate-set-root-504390

------------------------------------------------------------
revno: 4731 [merge]
revision-id: john at arbash-meinel.com-20100112043336-1w006pc2c52zqofb
parent: john at arbash-meinel.com-20100111231447-6qz31kgw07f3450d
parent: john at arbash-meinel.com-20100112043121-jazp286iwitj2ro8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.4-dirstate-set-root-504390
timestamp: Mon 2010-01-11 22:33:36 -0600
message:
  merge the test fix
modified:
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
-------------- next part --------------
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2010-01-11 22:17:42 +0000
+++ b/bzrlib/tests/test_transform.py	2010-01-12 04:31:21 +0000
@@ -2644,7 +2644,7 @@
         preview = self.get_empty_preview()
         root = preview.new_directory('', ROOT_PARENT, 'tree-root')
         # FIXME: new_directory should mark root.
-        preview.adjust_path('', ROOT_PARENT, root)
+        preview.fixup_new_roots()
         preview_tree = preview.get_preview_tree()
         file_trans_id = preview.new_file('a', preview.root, 'contents',
                                          'a-id')