/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-15 07:32:26 UTC
  • mfrom: (4536 +trunk)
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073226-a7ylxd6ctbzeu0o6
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
27
27
    def __init__(self, bzrdir, new_bound_location=None):
28
28
        self.bzrdir = bzrdir
29
29
        self.new_bound_location = new_bound_location
 
30
        self.local_repository = None
30
31
        try:
31
32
            self.repository = self.bzrdir.find_repository()
32
33
        except errors.NoRepositoryPresent:
217
218
    def _check(self):
218
219
        """Raise if reconfiguration would destroy local changes"""
219
220
        if self._destroy_tree:
220
 
            changes = self.tree.changes_from(self.tree.basis_tree())
221
 
            if changes.has_changed():
 
221
            # XXX: What about pending merges ? -- vila 20090629
 
222
            if self.tree.has_changes(self.tree.basis_tree()):
222
223
                raise errors.UncommittedChanges(self.tree)
223
224
        if self._create_reference and self.local_branch is not None:
224
225
            reference_branch = branch.Branch.open(self._select_bind_location())