~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

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

• reverse the comparison (5017.3.12 to 4595.7.3)
• stop comparing with revision 4595.7.3

Show diffs side-by-side

added

removed

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())

• Older »

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