Show More
@@ -836,10 +836,12 b' def bookmark(ui, repo, *names, **opts):' | |||||
836 | bookmarks.deletedivergent(repo, [target], mark) |
|
836 | bookmarks.deletedivergent(repo, [target], mark) | |
837 | return |
|
837 | return | |
838 |
|
838 | |||
|
839 | # consider successor changesets as well | |||
|
840 | foreground = obsolete.foreground(repo, [marks[mark]]) | |||
839 | deletefrom = [b for b in divs |
|
841 | deletefrom = [b for b in divs | |
840 | if repo[b].rev() in anc or b == target] |
|
842 | if repo[b].rev() in anc or b == target] | |
841 | bookmarks.deletedivergent(repo, deletefrom, mark) |
|
843 | bookmarks.deletedivergent(repo, deletefrom, mark) | |
842 | if bmctx.rev() in anc: |
|
844 | if bmctx.rev() in anc or target in foreground: | |
843 | ui.status(_("moving bookmark '%s' forward from %s\n") % |
|
845 | ui.status(_("moving bookmark '%s' forward from %s\n") % | |
844 | (mark, short(bmctx.node()))) |
|
846 | (mark, short(bmctx.node()))) | |
845 | return |
|
847 | return |
@@ -206,6 +206,7 b' Test no-argument update to a successor o' | |||||
206 | |/ |
|
206 | |/ | |
207 | o 0:60829823a42a 0 |
|
207 | o 0:60829823a42a 0 | |
208 |
|
208 | |||
|
209 | $ hg book bm -r 3 | |||
209 | $ hg status |
|
210 | $ hg status | |
210 | M foo |
|
211 | M foo | |
211 |
|
212 | |||
@@ -218,10 +219,16 b' We add simple obsolescence marker betwee' | |||||
218 | $ hg debugobsolete 6efa171f091b00a3c35edc15d48c52a498929953 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
|
219 | $ hg debugobsolete 6efa171f091b00a3c35edc15d48c52a498929953 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | |
219 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa d047485b3896813b2a624e86201983520f003206 |
|
220 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa d047485b3896813b2a624e86201983520f003206 | |
220 |
|
221 | |||
221 | Test that 5 is detected as a valid destination from 3 |
|
222 | Test that 5 is detected as a valid destination from 3 and also accepts moving | |
|
223 | the bookmark (issue4015) | |||
|
224 | ||||
222 | $ hg up --quiet --hidden 3 |
|
225 | $ hg up --quiet --hidden 3 | |
223 | $ hg up 5 |
|
226 | $ hg up 5 | |
224 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
227 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
228 | $ hg book bm | |||
|
229 | moving bookmark 'bm' forward from 6efa171f091b | |||
|
230 | $ hg bookmarks | |||
|
231 | * bm 5:ff252e8273df | |||
225 |
|
232 | |||
226 | Test that 5 is detected as a valid destination from 1 |
|
233 | Test that 5 is detected as a valid destination from 1 | |
227 | $ hg up --quiet 0 # we should be able to update to 3 directly |
|
234 | $ hg up --quiet 0 # we should be able to update to 3 directly |
General Comments 0
You need to be logged in to leave comments.
Login now