Rev 4596: Fix test_branch_from_trivial_stacked_branch_streaming_acceptance to work with rich root formats, pending work on bug 375013. in http://bazaar.launchpad.net/~lifeless/bzr/bug-375013
Robert Collins
robertc at robertcollins.net
Mon Aug 10 06:19:25 BST 2009
At http://bazaar.launchpad.net/~lifeless/bzr/bug-375013
------------------------------------------------------------
revno: 4596
revision-id: robertc at robertcollins.net-20090810051914-7akjrq0s5qcxz7bm
parent: pqm at pqm.ubuntu.com-20090807010459-nw1f0r9y1igi19xf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-375013
timestamp: Mon 2009-08-10 15:19:14 +1000
message:
Fix test_branch_from_trivial_stacked_branch_streaming_acceptance to work with rich root formats, pending work on bug 375013.
=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- a/bzrlib/tests/blackbox/test_branch.py 2009-08-03 04:19:03 +0000
+++ b/bzrlib/tests/blackbox/test_branch.py 2009-08-10 05:19:14 +0000
@@ -329,7 +329,9 @@
t.commit(message='commit %d' % count)
tree2 = t.branch.bzrdir.sprout('feature', stacked=True
).open_workingtree()
- tree2.commit('feature change')
+ local_tree = t.branch.bzrdir.sprout('local-working').open_workingtree()
+ local_tree.commit('feature change')
+ local_tree.branch.push(tree2.branch)
self.reset_smart_call_log()
out, err = self.run_bzr(['branch', self.get_url('feature'),
'local-target'])
More information about the bazaar-commits
mailing list