mercurial/hg.py
changeset 20870 6500a2eebee8
parent 20860 81d6dc8c3c63
parent 20868 5db105f216c3
child 21049 f117a0ba5289
equal deleted inserted replaced
20864:9a75d2559cff 20870:6500a2eebee8
   449                         update = '@'
   449                         update = '@'
   450                         bn = destrepo[uprev].branch()
   450                         bn = destrepo[uprev].branch()
   451                         if bn == 'default':
   451                         if bn == 'default':
   452                             status = _("updating to bookmark @\n")
   452                             status = _("updating to bookmark @\n")
   453                         else:
   453                         else:
   454                             status = _("updating to bookmark @ on branch %s\n"
   454                             status = (_("updating to bookmark @ on branch %s\n")
   455                                        % bn)
   455                                        % bn)
   456                     except KeyError:
   456                     except KeyError:
   457                         try:
   457                         try:
   458                             uprev = destrepo.branchtip('default')
   458                             uprev = destrepo.branchtip('default')
   459                         except error.RepoLookupError:
   459                         except error.RepoLookupError: