← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-20 19:46:46 UTC
  • mfrom: (4759 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4771.
  • Revision ID: john@arbash-meinel.com-20091020194646-wnqpd15qs19y28z7
Merge bzr.dev 4759, bringing in static_tuple and streaming improvements.

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:
269
 
            # XXX: What about pending merges ? -- vila 20090629
270
 
            if self.tree.has_changes(self.tree.basis_tree()):
 
268
        if self._destroy_tree and self.tree.has_changes():
271
269
                raise errors.UncommittedChanges(self.tree)
272
270
        if self._create_reference and self.local_branch is not None:
273
271
            reference_branch = branch.Branch.open(self._select_bind_location())