~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

• browse files at revision 4509.3.42
• compare with another revision
• compare with revision 6141
• download diff
• download tarball
• view history from revision 4509.3.42

Show diffs side-by-side

added

removed

bzrlib/reconfigure.py

266

266

    def _check(self):

267

267

        """Raise if reconfiguration would destroy local changes"""

268

268

        if self._destroy_tree:

269

 

            changes = self.tree.changes_from(self.tree.basis_tree())

270

 

            if changes.has_changed():

 

269

            # XXX: What about pending merges ? -- vila 20090629

 

270

            if self.tree.has_changes(self.tree.basis_tree()):

271

271

                raise errors.UncommittedChanges(self.tree)

272

272

        if self._create_reference and self.local_branch is not None:

273

273

            reference_branch = branch.Branch.open(self._select_bind_location())

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1