← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
24
24
from bzrlib.branch import Branch
25
25
from bzrlib.bzrdir import BzrDir
26
26
from bzrlib.conflicts import ConflictList
27
 
from bzrlib.delta import compare_trees
28
27
from bzrlib.osutils import abspath
29
28
from bzrlib.tests.blackbox import ExternalBase
30
29
import bzrlib.urlutils as urlutils
207
206
        # it is legal to attempt to merge an already-merged bundle
208
207
        output = self.runbzr('merge ../bundle')[1]
209
208
        # but it does nothing
210
 
        self.assertFalse(compare_trees(tree_a.basis_tree(), 
211
 
                                       tree_a).has_changed())
 
209
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
212
210
        self.assertEqual('Nothing to do.\n', output)