equal
deleted
inserted
replaced
593 bn = destrepo[uprev].branch() |
593 bn = destrepo[uprev].branch() |
594 if bn == 'default': |
594 if bn == 'default': |
595 status = _("updating to bookmark @\n") |
595 status = _("updating to bookmark @\n") |
596 else: |
596 else: |
597 status = (_("updating to bookmark @ on branch %s\n") |
597 status = (_("updating to bookmark @ on branch %s\n") |
598 % bn) |
598 % bn) |
599 except KeyError: |
599 except KeyError: |
600 try: |
600 try: |
601 uprev = destrepo.branchtip('default') |
601 uprev = destrepo.branchtip('default') |
602 except error.RepoLookupError: |
602 except error.RepoLookupError: |
603 uprev = destrepo.lookup('tip') |
603 uprev = destrepo.lookup('tip') |