/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/branch.py

  • Committer: Parth Malwankar
  • Date: 2010-07-14 06:32:03 UTC
  • mto: (5050.3.7 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: parth.malwankar@gmail.com-20100714063203-bp7edfdr22wx12tk
recursive binding now shows a clear error

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
246
246
        if not local and not config.has_explicit_nickname():
247
247
            try:
248
248
                master = self.get_master_branch(possible_transports)
 
249
                if master and self.repository.base == master.repository.base:
 
250
                    raise errors.RecursiveBind()
249
251
                if master is not None:
250
252
                    # return the master branch value
251
253
                    return master.nick
 
254
            except errors.RecursiveBind, e:
 
255
                raise e
252
256
            except errors.BzrError, e:
253
257
                # Silently fall back to local implicit nick if the master is
254
258
                # unavailable