Mercurial > hg
comparison mercurial/hg.py @ 17870:7d2dd10ce9ea stable
clone: activate @ bookmark if updating to it
The message "updating bookmark @ failed!" in test-bookmarks-pushpull.t
is correct, because the changeset that the @ bookmark points to is not
pushed to the target repository.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 26 Oct 2012 14:37:03 +0200 |
parents | c9339efed653 |
children | 52c7e171e355 |
comparison
equal
deleted
inserted
replaced
17869:c79b404b99ae | 17870:7d2dd10ce9ea |
---|---|
416 except error.RepoLookupError: | 416 except error.RepoLookupError: |
417 pass | 417 pass |
418 if uprev is None: | 418 if uprev is None: |
419 try: | 419 try: |
420 uprev = destrepo._bookmarks['@'] | 420 uprev = destrepo._bookmarks['@'] |
421 update = '@' | |
421 except KeyError: | 422 except KeyError: |
422 try: | 423 try: |
423 uprev = destrepo.branchtip('default') | 424 uprev = destrepo.branchtip('default') |
424 except error.RepoLookupError: | 425 except error.RepoLookupError: |
425 uprev = destrepo.lookup('tip') | 426 uprev = destrepo.lookup('tip') |