equal
deleted
inserted
replaced
6481 ret = hg.update(repo, rev) |
6481 ret = hg.update(repo, rev) |
6482 |
6482 |
6483 if not ret and movemarkfrom: |
6483 if not ret and movemarkfrom: |
6484 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
6484 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
6485 ui.status(_("updating bookmark %s\n") % repo._activebookmark) |
6485 ui.status(_("updating bookmark %s\n") % repo._activebookmark) |
|
6486 else: |
|
6487 # this can happen with a non-linear update |
|
6488 ui.status(_("(leaving bookmark %s)\n") % |
|
6489 repo._activebookmark) |
|
6490 bookmarks.deactivate(repo) |
6486 elif brev in repo._bookmarks: |
6491 elif brev in repo._bookmarks: |
6487 bookmarks.activate(repo, brev) |
6492 bookmarks.activate(repo, brev) |
6488 ui.status(_("(activating bookmark %s)\n") % brev) |
6493 ui.status(_("(activating bookmark %s)\n") % brev) |
6489 elif brev: |
6494 elif brev: |
6490 if repo._activebookmark: |
6495 if repo._activebookmark: |