Show More
@@ -847,12 +847,10 b' def bookmark(ui, repo, *names, **opts):' | |||
|
847 | 847 | bookmarks.deletedivergent(repo, [target], mark) |
|
848 | 848 | return |
|
849 | 849 | |
|
850 | # consider successor changesets as well | |
|
851 | foreground = obsolete.foreground(repo, [marks[mark]]) | |
|
852 | 850 | deletefrom = [b for b in divs |
|
853 | 851 | if repo[b].rev() in anc or b == target] |
|
854 | 852 | bookmarks.deletedivergent(repo, deletefrom, mark) |
|
855 | if bmctx.rev() in anc or target in foreground: | |
|
853 | if bookmarks.validdest(repo, bmctx, repo[target]): | |
|
856 | 854 | ui.status(_("moving bookmark '%s' forward from %s\n") % |
|
857 | 855 | (mark, short(bmctx.node()))) |
|
858 | 856 | return |
General Comments 0
You need to be logged in to leave comments.
Login now