/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: Martin Pool
  • Date: 2008-05-08 04:33:38 UTC
  • mfrom: (3414 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080508043338-ru3vflx8z641a76k
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
203
203
            changes = self.tree.changes_from(self.tree.basis_tree())
204
204
            if changes.has_changed():
205
205
                raise errors.UncommittedChanges(self.tree)
 
206
        if self._create_reference and self.local_branch is not None:
 
207
            reference_branch = branch.Branch.open(self._select_bind_location())
 
208
            if (reference_branch.last_revision() !=
 
209
                self.local_branch.last_revision()):
 
210
                raise errors.UnsyncedBranches(self.bzrdir, reference_branch)
206
211
 
207
212
    def _select_bind_location(self):
208
213
        """Select a location to bind or create a reference to.