← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
92
92
        log = StringIO()
93
93
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
94
94
                    this_tree=tree_b, ignore_zero=True)
95
 
        lines = self._get_log().splitlines(True)[-1]
96
 
        self.failUnless('All changes applied successfully.\n' not in lines)
 
95
        log = self._get_log()
 
96
        self.failUnless('All changes applied successfully.\n' not in log)
97
97
        tree_b.revert([])
98
98
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
99
99
                    this_tree=tree_b, ignore_zero=False)
100
 
        lines = self._get_log().splitlines(True)[-1]
101
 
        self.failUnless('All changes applied successfully.\n' in lines)
 
100
        log = self._get_log()
 
101
        self.failUnless('All changes applied successfully.\n' in log)