Rev 2827: remove dead code in http://sourcefrog.net/bzr/test-cleanup
Martin Pool
mbp at sourcefrog.net
Mon Sep 17 04:33:16 BST 2007
At http://sourcefrog.net/bzr/test-cleanup
------------------------------------------------------------
revno: 2827
revision-id: mbp at sourcefrog.net-20070917033315-xdp5bb3pu60e7b1o
parent: mbp at sourcefrog.net-20070917033300-7jwnccl3tro1e0j6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Mon 2007-09-17 13:33:15 +1000
message:
remove dead code
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py 2007-09-05 03:51:23 +0000
+++ b/bzrlib/tests/test_merge.py 2007-09-17 03:33:15 +0000
@@ -137,7 +137,6 @@
dir_b = tree_a.bzrdir.sprout('b')
tree_b = dir_b.open_workingtree()
tree_a.commit(message="hello again")
- log = StringIO()
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
this_tree=tree_b, ignore_zero=True)
log = self._get_log(keep_log_file=True)
More information about the bazaar-commits
mailing list