← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-08-02 23:49:34 UTC
  • mfrom: (5362.1.1 merge-2.2-into-trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20100802234934-d963xmqwx5gzevr0
(Andrew Bennetts) Merge 2.2 branch back into trunk

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.user_url == master.user_url:
 
250
                    raise errors.RecursiveBind(self.user_url)
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