Rev 2374: XXX Workaround the DirStateRevisionTree bug until we get a proper fix, tests pass again in http://bzr.arbash-meinel.com/branches/bzr/experimental/dirstate

John Arbash Meinel john at arbash-meinel.com
Fri Feb 23 02:24:12 GMT 2007


At http://bzr.arbash-meinel.com/branches/bzr/experimental/dirstate

------------------------------------------------------------
revno: 2374
revision-id: john at arbash-meinel.com-20070223022410-1i5d131dir9ds30w
parent: john at arbash-meinel.com-20070223021644-7hp2p2f3rjvkmx4s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-22 20:24:10 -0600
message:
  XXX Workaround the DirStateRevisionTree bug until we get a proper fix, tests pass again
modified:
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
-------------- next part --------------
=== modified file 'bzrlib/tests/workingtree_implementations/test_workingtree.py'
--- a/bzrlib/tests/workingtree_implementations/test_workingtree.py	2007-02-21 11:10:37 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_workingtree.py	2007-02-23 02:24:10 +0000
@@ -591,7 +591,10 @@
         file('mine/blo', 'wb').write('on')
         tree.add(['bloo', 'blo'])
         tree.commit("blah", allow_pointless=False)
-        base = tree.basis_tree()
+        # XXX: jam 20070222 currently DirStateRevisionTree fail if you change the
+        #      WorkingTree underneath them before they are accessed. So
+        #      instead, let's go back to the repository for now.
+        base = tree.branch.repository.revision_tree(tree.last_revision())
         bzrdir.BzrDir.open("mine").sprout("other")
         file('other/bloo', 'wb').write('two')
         othertree = WorkingTree.open('other')



More information about the bazaar-commits mailing list