Rev 4547: Fix test_smart's test_history_incomplete to generate a good tree before committing. in http://bazaar.launchpad.net/~lifeless/bzr/apply-inventory-delta
Robert Collins
robertc at robertcollins.net
Mon Jul 20 06:13:08 BST 2009
At http://bazaar.launchpad.net/~lifeless/bzr/apply-inventory-delta
------------------------------------------------------------
revno: 4547
revision-id: robertc at robertcollins.net-20090720051304-j6p9eea55kknii25
parent: robertc at robertcollins.net-20090720044306-hx9ah6m9b93035l6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: apply-inventory-delta
timestamp: Mon 2009-07-20 15:13:04 +1000
message:
Fix test_smart's test_history_incomplete to generate a good tree before committing.
=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py 2009-06-15 06:47:14 +0000
+++ b/bzrlib/tests/test_smart.py 2009-07-20 05:13:04 +0000
@@ -1190,8 +1190,11 @@
backing = self.get_transport()
request = smart.repository.SmartServerRepositoryGetRevIdForRevno(backing)
parent = self.make_branch_and_memory_tree('parent', format='1.9')
+ parent.lock_write()
+ parent.add([''], ['TREE_ROOT'])
r1 = parent.commit(message='first commit')
r2 = parent.commit(message='second commit')
+ parent.unlock()
local = self.make_branch_and_memory_tree('local', format='1.9')
local.branch.pull(parent.branch)
local.set_parent_ids([r2])
More information about the bazaar-commits
mailing list