← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2010-07-17 16:36:00 UTC
  • mfrom: (5050.3.9 2.2)
  • mto: (5050.3.10 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100717163600-jaw27ncuhkhkz8sy
merge news from 2.2b4

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