Show More
@@ -6619,7 +6619,9 b' def update(ui, repo, node=None, rev=None' | |||
|
6619 | 6619 | ret = hg.update(repo, rev) |
|
6620 | 6620 | |
|
6621 | 6621 | if not ret and movemarkfrom: |
|
6622 |
if |
|
|
6622 | if movemarkfrom == repo['.'].node(): | |
|
6623 | pass # no-op update | |
|
6624 | elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
|
6623 | 6625 | ui.status(_("updating bookmark %s\n") % repo._activebookmark) |
|
6624 | 6626 | else: |
|
6625 | 6627 | # this can happen with a non-linear update |
@@ -732,6 +732,19 b' test non-linear update not clearing acti' | |||
|
732 | 732 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
733 | 733 | (activating bookmark four) |
|
734 | 734 | |
|
735 | no-op update doesn't deactive bookmarks | |
|
736 | ||
|
737 | $ hg up | |
|
738 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
739 | $ hg sum | |
|
740 | parent: 3:9ba5f110a0b3 tip | |
|
741 | y | |
|
742 | branch: test | |
|
743 | bookmarks: *four | |
|
744 | commit: 2 unknown (clean) | |
|
745 | update: (current) | |
|
746 | phases: 4 draft | |
|
747 | ||
|
735 | 748 | test clearing divergent bookmarks of linear ancestors |
|
736 | 749 | |
|
737 | 750 | $ hg bookmark Z -r 0 |
General Comments 0
You need to be logged in to leave comments.
Login now