Rev 2483: Make test_iter_reverse_revision_history flush the working tree after commit before merging, as merge still does _write_inventory. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

Robert Collins robertc at robertcollins.net
Thu Mar 1 11:58:35 GMT 2007


At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2483
revision-id: robertc at robertcollins.net-20070301115646-t40d51cvqsrok6b5
parent: robertc at robertcollins.net-20070301115027-7ch3pnc922va6fr5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 22:56:46 +1100
message:
  Make test_iter_reverse_revision_history flush the working tree after commit before merging, as merge still does _write_inventory.
modified:
  bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
=== modified file 'bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py'
--- a/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py	2007-02-17 02:02:41 +0000
+++ b/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py	2007-03-01 11:56:46 +0000
@@ -71,6 +71,7 @@
             tree2.commit('rev-2-4', rev_id='rev-2-4')
 
             tree1.commit('rev-1-2', rev_id='rev-1-2')
+            tree1.flush() # workaround merge using _write_inventory
             tree1.merge_from_branch(tree2.branch)
             tree1.commit('rev-1-3', rev_id='rev-1-3')
 



More information about the bazaar-commits mailing list