← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-21 16:03:07 UTC
  • mfrom: (1927.3.5 throw_log_away)
  • Revision ID: pqm@pqm.ubuntu.com-20060921160307-6081481c9a444cce
(cfbolz) Throw away disk logfile if not used

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
136
136
        log = StringIO()
137
137
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
138
138
                    this_tree=tree_b, ignore_zero=True)
139
 
        log = self._get_log()
 
139
        log = self._get_log(keep_log_file=True)
140
140
        self.failUnless('All changes applied successfully.\n' not in log)
141
141
        tree_b.revert([])
142
142
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
143
143
                    this_tree=tree_b, ignore_zero=False)
144
 
        log = self._get_log()
 
144
        log = self._get_log(keep_log_file=True)
145
145
        self.failUnless('All changes applied successfully.\n' in log)
146
146
 
147
147
    def test_merge_inner_conflicts(self):