← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
22
22
 
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.conflicts import ConflictList, Conflict
25
 
from bzrlib.delta import compare_trees
26
25
from bzrlib.errors import (BzrCommandError,
27
26
                           BzrError,
28
27
                           NoCommonAncestor,
116
115
 
117
116
        if self.other_rev_id is None:
118
117
            other_basis_tree = self.revision_tree(self.other_basis)
119
 
            changes = compare_trees(self.other_tree, other_basis_tree)
 
118
            changes = other_basis_tree.changes_from(self.other_tree)
120
119
            if changes.has_changed():
121
120
                raise WorkingTreeNotRevision(self.this_tree)
122
121
            other_rev_id = self.other_basis
145
144
                raise BzrCommandError("Working tree has uncommitted changes.")
146
145
 
147
146
    def compare_basis(self):
148
 
        changes = compare_trees(self.this_tree, 
149
 
                                self.this_tree.basis_tree(), False)
 
147
        changes = self.this_tree.changes_from(self.this_tree.basis_tree())
150
148
        if not changes.has_changed():
151
149
            self.this_rev_id = self.this_basis
152
150