← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
265
265
 
266
266
    def _check(self):
267
267
        """Raise if reconfiguration would destroy local changes"""
268
 
        if self._destroy_tree and self.tree.has_changes():
 
268
        if self._destroy_tree:
 
269
            # XXX: What about pending merges ? -- vila 20090629
 
270
            if self.tree.has_changes(self.tree.basis_tree()):
269
271
                raise errors.UncommittedChanges(self.tree)
270
272
        if self._create_reference and self.local_branch is not None:
271
273
            reference_branch = branch.Branch.open(self._select_bind_location())