← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-07-10 09:37:08 UTC
  • mfrom: (4524.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090710093708-s3ru5i9avw0pykjm
(vila) Quicker check for changes in mutable trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
218
218
    def _check(self):
219
219
        """Raise if reconfiguration would destroy local changes"""
220
220
        if self._destroy_tree:
221
 
            changes = self.tree.changes_from(self.tree.basis_tree())
222
 
            if changes.has_changed():
 
221
            # XXX: What about pending merges ? -- vila 20090629
 
222
            if self.tree.has_changes(self.tree.basis_tree()):
223
223
                raise errors.UncommittedChanges(self.tree)
224
224
        if self._create_reference and self.local_branch is not None:
225
225
            reference_branch = branch.Branch.open(self._select_bind_location())