test-bookmarks.t
783 lines
| 19.8 KiB
| text/troff
|
Tads3Lexer
/ tests / test-bookmarks.t
|
r11861 | $ hg init | ||
no bookmarks | ||||
$ hg bookmarks | ||||
no bookmarks set | ||||
|
r22776 | $ hg bookmarks -Tjson | ||
[ | ||||
] | ||||
|
r11861 | bookmark rev -1 | ||
$ hg bookmark X | ||||
list bookmarks | ||||
$ hg bookmarks | ||||
* X -1:000000000000 | ||||
list bookmarks with color | ||||
$ hg --config extensions.color= --config color.mode=ansi \ | ||||
> bookmarks --color=always | ||||
|
r22775 | \x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc) | ||
|
r11861 | |||
$ echo a > a | ||||
$ hg add a | ||||
$ hg commit -m 0 | ||||
bookmark X moved to rev 0 | ||||
$ hg bookmarks | ||||
* X 0:f7b1eb17ad24 | ||||
look up bookmark | ||||
$ hg log -r X | ||||
changeset: 0:f7b1eb17ad24 | ||||
|
r13386 | bookmark: X | ||
|
r11861 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 0 | ||||
|
r18075 | second bookmark for rev 0, command should work even with ui.strict on | ||
|
r11861 | |||
|
r18075 | $ hg --config ui.strict=1 bookmark X2 | ||
|
r11861 | |||
bookmark rev -1 again | ||||
$ hg bookmark -r null Y | ||||
list bookmarks | ||||
$ hg bookmarks | ||||
|
r13416 | X 0:f7b1eb17ad24 | ||
|
r13448 | * X2 0:f7b1eb17ad24 | ||
|
r11861 | Y -1:000000000000 | ||
$ echo b > b | ||||
$ hg add b | ||||
$ hg commit -m 1 | ||||
|
r22776 | $ hg bookmarks -Tjson | ||
[ | ||||
{ | ||||
"active": false, | ||||
"bookmark": "X", | ||||
"node": "f7b1eb17ad24730a1651fccd46c43826d1bbc2ac", | ||||
"rev": 0 | ||||
}, | ||||
{ | ||||
"active": true, | ||||
"bookmark": "X2", | ||||
"node": "925d80f479bb026b0fb3deb27503780b13f74123", | ||||
"rev": 1 | ||||
}, | ||||
{ | ||||
"active": false, | ||||
"bookmark": "Y", | ||||
"node": "0000000000000000000000000000000000000000", | ||||
"rev": -1 | ||||
} | ||||
] | ||||
|
r12714 | bookmarks revset | ||
$ hg log -r 'bookmark()' | ||||
|
r13416 | changeset: 0:f7b1eb17ad24 | ||
|
r13386 | bookmark: X | ||
|
r12714 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
|
r13416 | summary: 0 | ||
|
r12714 | |||
|
r13448 | changeset: 1:925d80f479bb | ||
bookmark: X2 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 1 | ||||
|
r12714 | $ hg log -r 'bookmark(Y)' | ||
$ hg log -r 'bookmark(X2)' | ||||
|
r13448 | changeset: 1:925d80f479bb | ||
|
r13386 | bookmark: X2 | ||
|
r13448 | tag: tip | ||
|
r12714 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
|
r13448 | summary: 1 | ||
|
r12714 | |||
|
r16822 | $ hg log -r 'bookmark("re:X")' | ||
changeset: 0:f7b1eb17ad24 | ||||
bookmark: X | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 0 | ||||
changeset: 1:925d80f479bb | ||||
bookmark: X2 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 1 | ||||
|
r22105 | $ hg log -r 'bookmark("literal:X")' | ||
changeset: 0:f7b1eb17ad24 | ||||
bookmark: X | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 0 | ||||
|
r13925 | $ hg log -r 'bookmark(unknown)' | ||
|
r23978 | abort: bookmark 'unknown' does not exist! | ||
|
r13925 | [255] | ||
|
r26538 | $ hg log -r 'bookmark("literal:unknown")' | ||
abort: bookmark 'unknown' does not exist! | ||||
[255] | ||||
|
r23978 | $ hg log -r 'bookmark("re:unknown")' | ||
abort: no bookmarks exist that match 'unknown'! | ||||
[255] | ||||
$ hg log -r 'present(bookmark("literal:unknown"))' | ||||
$ hg log -r 'present(bookmark("re:unknown"))' | ||||
|
r13925 | |||
|
r12822 | $ hg help revsets | grep 'bookmark(' | ||
"bookmark([name])" | ||||
|
r12714 | |||
|
r11861 | bookmarks X and X2 moved to rev 1, Y at rev -1 | ||
$ hg bookmarks | ||||
|
r13416 | X 0:f7b1eb17ad24 | ||
|
r13448 | * X2 1:925d80f479bb | ||
|
r11861 | Y -1:000000000000 | ||
bookmark rev 0 again | ||||
$ hg bookmark -r 0 Z | ||||
|
r13416 | $ hg update X | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
r21503 | (activating bookmark X) | ||
|
r11861 | $ echo c > c | ||
$ hg add c | ||||
$ hg commit -m 2 | ||||
|
r13416 | created new head | ||
|
r11861 | |||
|
r13416 | bookmarks X moved to rev 2, Y at rev -1, Z at rev 0 | ||
|
r11861 | |||
$ hg bookmarks | ||||
|
r13416 | * X 2:db815d6d32e6 | ||
|
r13448 | X2 1:925d80f479bb | ||
|
r13388 | Y -1:000000000000 | ||
|
r11861 | Z 0:f7b1eb17ad24 | ||
rename nonexistent bookmark | ||||
$ hg bookmark -m A B | ||||
|
r13911 | abort: bookmark 'A' does not exist | ||
|
r12316 | [255] | ||
|
r11861 | |||
rename to existent bookmark | ||||
$ hg bookmark -m X Y | ||||
|
r13911 | abort: bookmark 'Y' already exists (use -f to force) | ||
|
r12316 | [255] | ||
|
r11861 | |||
force rename to existent bookmark | ||||
$ hg bookmark -f -m X Y | ||||
list bookmarks | ||||
$ hg bookmark | ||||
|
r13448 | X2 1:925d80f479bb | ||
|
r13416 | * Y 2:db815d6d32e6 | ||
|
r11861 | Z 0:f7b1eb17ad24 | ||
|
r17686 | bookmarks from a revset | ||
$ hg bookmark -r '.^1' REVSET | ||||
$ hg bookmark -r ':tip' TIP | ||||
|
r19112 | $ hg up -q TIP | ||
|
r17686 | $ hg bookmarks | ||
REVSET 0:f7b1eb17ad24 | ||||
* TIP 2:db815d6d32e6 | ||||
X2 1:925d80f479bb | ||||
Y 2:db815d6d32e6 | ||||
Z 0:f7b1eb17ad24 | ||||
$ hg bookmark -d REVSET | ||||
$ hg bookmark -d TIP | ||||
|
r19147 | rename without new name or multiple names | ||
|
r11861 | |||
$ hg bookmark -m Y | ||||
abort: new bookmark name required | ||||
|
r12316 | [255] | ||
|
r19147 | $ hg bookmark -m Y Y2 Y3 | ||
abort: only one new bookmark name allowed | ||||
[255] | ||||
|
r11861 | |||
delete without name | ||||
$ hg bookmark -d | ||||
abort: bookmark name required | ||||
|
r12316 | [255] | ||
|
r11861 | |||
delete nonexistent bookmark | ||||
$ hg bookmark -d A | ||||
|
r13911 | abort: bookmark 'A' does not exist | ||
|
r12316 | [255] | ||
|
r11861 | |||
bookmark name with spaces should be stripped | ||||
$ hg bookmark ' x y ' | ||||
list bookmarks | ||||
$ hg bookmarks | ||||
|
r13448 | X2 1:925d80f479bb | ||
|
r13416 | Y 2:db815d6d32e6 | ||
|
r11861 | Z 0:f7b1eb17ad24 | ||
|
r13416 | * x y 2:db815d6d32e6 | ||
|
r11861 | |||
look up stripped bookmark name | ||||
$ hg log -r '"x y"' | ||||
|
r13416 | changeset: 2:db815d6d32e6 | ||
|
r13386 | bookmark: Y | ||
bookmark: x y | ||||
|
r11861 | tag: tip | ||
|
r13416 | parent: 0:f7b1eb17ad24 | ||
|
r11861 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 | ||||
reject bookmark name with newline | ||||
$ hg bookmark ' | ||||
> ' | ||||
|
r17814 | abort: bookmark names cannot consist entirely of whitespace | ||
|
r12316 | [255] | ||
|
r11861 | |||
|
r17789 | $ hg bookmark -m Z ' | ||
> ' | ||||
|
r17814 | abort: bookmark names cannot consist entirely of whitespace | ||
|
r17789 | [255] | ||
|
r17816 | bookmark with reserved name | ||
$ hg bookmark tip | ||||
abort: the name 'tip' is reserved | ||||
[255] | ||||
$ hg bookmark . | ||||
abort: the name '.' is reserved | ||||
[255] | ||||
$ hg bookmark null | ||||
abort: the name 'null' is reserved | ||||
[255] | ||||
|
r11861 | bookmark with existing name | ||
|
r18773 | $ hg bookmark X2 | ||
abort: bookmark 'X2' already exists (use -f to force) | ||||
|
r12316 | [255] | ||
|
r11861 | |||
|
r17789 | $ hg bookmark -m Y Z | ||
abort: bookmark 'Z' already exists (use -f to force) | ||||
[255] | ||||
bookmark with name of branch | ||||
$ hg bookmark default | ||||
abort: a bookmark cannot have the name of an existing branch | ||||
[255] | ||||
$ hg bookmark -m Y default | ||||
abort: a bookmark cannot have the name of an existing branch | ||||
[255] | ||||
|
r18566 | bookmark with integer name | ||
$ hg bookmark 10 | ||||
|
r19070 | abort: cannot use an integer as a name | ||
|
r18566 | [255] | ||
|
r17790 | incompatible options | ||
$ hg bookmark -m Y -d Z | ||||
abort: --delete and --rename are incompatible | ||||
[255] | ||||
$ hg bookmark -r 1 -d Z | ||||
abort: --rev is incompatible with --delete | ||||
[255] | ||||
$ hg bookmark -r 1 -m Z Y | ||||
abort: --rev is incompatible with --rename | ||||
[255] | ||||
|
r11861 | force bookmark with existing name | ||
|
r18773 | $ hg bookmark -f X2 | ||
|
r18782 | |||
force bookmark back to where it was, should deactivate it | ||||
|
r18773 | $ hg bookmark -fr1 X2 | ||
|
r18782 | $ hg bookmarks | ||
X2 1:925d80f479bb | ||||
Y 2:db815d6d32e6 | ||||
Z 0:f7b1eb17ad24 | ||||
x y 2:db815d6d32e6 | ||||
|
r18773 | |||
forward bookmark to descendant without --force | ||||
$ hg bookmark Z | ||||
|
r18774 | moving bookmark 'Z' forward from f7b1eb17ad24 | ||
|
r11861 | |||
list bookmarks | ||||
$ hg bookmark | ||||
|
r13448 | X2 1:925d80f479bb | ||
|
r13416 | Y 2:db815d6d32e6 | ||
* Z 2:db815d6d32e6 | ||||
x y 2:db815d6d32e6 | ||||
|
r11861 | |||
revision but no bookmark name | ||||
$ hg bookmark -r . | ||||
abort: bookmark name required | ||||
|
r12316 | [255] | ||
|
r11861 | |||
bookmark name with whitespace only | ||||
$ hg bookmark ' ' | ||||
abort: bookmark names cannot consist entirely of whitespace | ||||
|
r12316 | [255] | ||
|
r13425 | |||
|
r17789 | $ hg bookmark -m Y ' ' | ||
abort: bookmark names cannot consist entirely of whitespace | ||||
[255] | ||||
|
r13425 | invalid bookmark | ||
$ hg bookmark 'foo:bar' | ||||
|
r17850 | abort: ':' cannot be used in a name | ||
|
r17821 | [255] | ||
$ hg bookmark 'foo | ||||
> bar' | ||||
|
r17850 | abort: '\n' cannot be used in a name | ||
|
r13425 | [255] | ||
|
r13474 | the bookmark extension should be ignored now that it is part of core | ||
$ echo "[extensions]" >> $HGRCPATH | ||||
$ echo "bookmarks=" >> $HGRCPATH | ||||
$ hg bookmarks | ||||
X2 1:925d80f479bb | ||||
Y 2:db815d6d32e6 | ||||
* Z 2:db815d6d32e6 | ||||
x y 2:db815d6d32e6 | ||||
|
r14266 | |||
|
r13454 | test summary | ||
$ hg summary | ||||
|
r14906 | parent: 2:db815d6d32e6 tip | ||
|
r13454 | 2 | ||
branch: default | ||||
|
r14906 | bookmarks: *Z Y x y | ||
|
r13454 | commit: (clean) | ||
update: 1 new changesets, 2 branch heads (merge) | ||||
|
r25382 | phases: 3 draft | ||
|
r13454 | |||
|
r13477 | test id | ||
$ hg id | ||||
db815d6d32e6 tip Y/Z/x y | ||||
|
r14266 | |||
test rollback | ||||
|
r14268 | $ echo foo > f1 | ||
|
r25744 | $ hg bookmark tmp-rollback | ||
|
r14268 | $ hg ci -Amr | ||
adding f1 | ||||
|
r25744 | $ hg bookmarks | ||
X2 1:925d80f479bb | ||||
Y 2:db815d6d32e6 | ||||
Z 2:db815d6d32e6 | ||||
* tmp-rollback 3:2bf5cfec5864 | ||||
x y 2:db815d6d32e6 | ||||
|
r14266 | $ hg rollback | ||
|
r14268 | repository tip rolled back to revision 2 (undo commit) | ||
working directory now based on revision 2 | ||||
$ hg bookmarks | ||||
X2 1:925d80f479bb | ||||
Y 2:db815d6d32e6 | ||||
|
r18782 | Z 2:db815d6d32e6 | ||
|
r25744 | * tmp-rollback 2:db815d6d32e6 | ||
|
r14268 | x y 2:db815d6d32e6 | ||
|
r25744 | $ hg bookmark -f Z -r 1 | ||
$ hg rollback | ||||
repository tip rolled back to revision 2 (undo bookmark) | ||||
$ hg bookmarks | ||||
X2 1:925d80f479bb | ||||
Y 2:db815d6d32e6 | ||||
Z 2:db815d6d32e6 | ||||
* tmp-rollback 2:db815d6d32e6 | ||||
x y 2:db815d6d32e6 | ||||
$ hg bookmark -d tmp-rollback | ||||
|
r14268 | |||
|
r18781 | activate bookmark on working dir parent without --force | ||
$ hg bookmark --inactive Z | ||||
$ hg bookmark Z | ||||
|
r13604 | test clone | ||
|
r16276 | $ hg bookmark -r 2 -i @ | ||
$ hg bookmark -r 2 -i a@ | ||||
|
r14266 | $ hg bookmarks | ||
|
r16276 | @ 2:db815d6d32e6 | ||
|
r13604 | X2 1:925d80f479bb | ||
Y 2:db815d6d32e6 | ||||
* Z 2:db815d6d32e6 | ||||
|
r16276 | a@ 2:db815d6d32e6 | ||
|
r13604 | x y 2:db815d6d32e6 | ||
$ hg clone . cloned-bookmarks | ||||
|
r17882 | updating to bookmark @ | ||
|
r13604 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ hg -R cloned-bookmarks bookmarks | ||||
|
r17870 | * @ 2:db815d6d32e6 | ||
|
r13604 | X2 1:925d80f479bb | ||
Y 2:db815d6d32e6 | ||||
Z 2:db815d6d32e6 | ||||
|
r16276 | a@ 2:db815d6d32e6 | ||
|
r13604 | x y 2:db815d6d32e6 | ||
test clone with pull protocol | ||||
$ hg clone --pull . cloned-bookmarks-pull | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 3 changesets with 3 changes to 3 files (+1 heads) | ||||
|
r17882 | updating to bookmark @ | ||
|
r13604 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ hg -R cloned-bookmarks-pull bookmarks | ||||
|
r17870 | * @ 2:db815d6d32e6 | ||
|
r14266 | X2 1:925d80f479bb | ||
|
r13604 | Y 2:db815d6d32e6 | ||
Z 2:db815d6d32e6 | ||||
|
r16276 | a@ 2:db815d6d32e6 | ||
|
r13604 | x y 2:db815d6d32e6 | ||
|
r19147 | delete multiple bookmarks at once | ||
$ hg bookmark -d @ a@ | ||||
|
r16276 | |||
|
r17868 | test clone with a bookmark named "default" (issue3677) | ||
$ hg bookmark -r 1 -f -i default | ||||
$ hg clone . cloned-bookmark-default | ||||
updating to branch default | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg -R cloned-bookmark-default bookmarks | ||||
X2 1:925d80f479bb | ||||
Y 2:db815d6d32e6 | ||||
Z 2:db815d6d32e6 | ||||
default 1:925d80f479bb | ||||
x y 2:db815d6d32e6 | ||||
$ hg -R cloned-bookmark-default parents -q | ||||
2:db815d6d32e6 | ||||
$ hg bookmark -d default | ||||
|
r13604 | test clone with a specific revision | ||
$ hg clone -r 925d80 . cloned-bookmarks-rev | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 2 changes to 2 files | ||||
updating to branch default | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg -R cloned-bookmarks-rev bookmarks | ||||
X2 1:925d80f479bb | ||||
|
r13663 | |||
|
r17703 | test clone with update to a bookmark | ||
|
r25893 | $ hg clone -u Z . ../cloned-bookmarks-update | ||
|
r17703 | updating to branch default | ||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r25893 | $ hg -R ../cloned-bookmarks-update bookmarks | ||
|
r17703 | X2 1:925d80f479bb | ||
Y 2:db815d6d32e6 | ||||
* Z 2:db815d6d32e6 | ||||
x y 2:db815d6d32e6 | ||||
|
r13663 | create bundle with two heads | ||
$ hg clone . tobundle | ||||
updating to branch default | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo x > tobundle/x | ||||
$ hg -R tobundle add tobundle/x | ||||
$ hg -R tobundle commit -m'x' | ||||
$ hg -R tobundle update -r -2 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo y > tobundle/y | ||||
$ hg -R tobundle branch test | ||||
marked working directory as branch test | ||||
|
r15615 | (branches are permanent and global, did you want a bookmark?) | ||
|
r13663 | $ hg -R tobundle add tobundle/y | ||
$ hg -R tobundle commit -m'y' | ||||
$ hg -R tobundle bundle tobundle.hg | ||||
searching for changes | ||||
2 changesets found | ||||
$ hg unbundle tobundle.hg | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 2 changes to 2 files (+1 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
|
r18471 | |||
|
r25349 | update to active bookmark if it's not the parent | ||
|
r18471 | |||
|
r18620 | $ hg summary | ||
parent: 2:db815d6d32e6 | ||||
2 | ||||
branch: default | ||||
|
r22091 | bookmarks: *Z Y x y | ||
|
r18620 | commit: 1 added, 1 unknown (new branch head) | ||
update: 2 new changesets (update) | ||||
|
r25382 | phases: 5 draft | ||
|
r13663 | $ hg update | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r22091 | updating bookmark Z | ||
|
r13663 | $ hg bookmarks | ||
X2 1:925d80f479bb | ||||
Y 2:db815d6d32e6 | ||||
* Z 3:125c9a1d6df6 | ||||
x y 2:db815d6d32e6 | ||||
|
r19523 | pull --update works the same as pull && update | ||
$ hg bookmark -r3 Y | ||||
moving bookmark 'Y' forward from db815d6d32e6 | ||||
|
r26285 | $ cp -r ../cloned-bookmarks-update ../cloned-bookmarks-manual-update | ||
(manual version) | ||||
$ hg -R ../cloned-bookmarks-manual-update update Y | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(activating bookmark Y) | ||||
$ hg -R ../cloned-bookmarks-manual-update pull . | ||||
pulling from . | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 2 changes to 2 files (+1 heads) | ||||
updating bookmark Y | ||||
updating bookmark Z | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
|
r26286 | |||
(# tests strange but with --date crashing when bookmark have to move) | ||||
$ hg -R ../cloned-bookmarks-manual-update update -d 1986 | ||||
abort: revision matching date not found | ||||
[255] | ||||
|
r26285 | $ hg -R ../cloned-bookmarks-manual-update update | ||
updating to active bookmark Y | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(activating bookmark Y) | ||||
(all in one version) | ||||
|
r25893 | $ hg -R ../cloned-bookmarks-update update Y | ||
|
r19523 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r21503 | (activating bookmark Y) | ||
|
r25893 | $ hg -R ../cloned-bookmarks-update pull --update . | ||
|
r19523 | pulling from . | ||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 2 changes to 2 files (+1 heads) | ||||
updating bookmark Y | ||||
updating bookmark Z | ||||
updating to active bookmark Y | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r14845 | test wrongly formated bookmark | ||
$ echo '' >> .hg/bookmarks | ||||
$ hg bookmarks | ||||
X2 1:925d80f479bb | ||||
|
r19523 | Y 3:125c9a1d6df6 | ||
|
r14845 | * Z 3:125c9a1d6df6 | ||
x y 2:db815d6d32e6 | ||||
|
r14846 | $ echo "Ican'thasformatedlines" >> .hg/bookmarks | ||
$ hg bookmarks | ||||
malformed line in .hg/bookmarks: "Ican'thasformatedlines" | ||||
X2 1:925d80f479bb | ||||
|
r19523 | Y 3:125c9a1d6df6 | ||
|
r14846 | * Z 3:125c9a1d6df6 | ||
x y 2:db815d6d32e6 | ||||
|
r16573 | test missing revisions | ||
$ echo "925d80f479bc z" > .hg/bookmarks | ||||
$ hg book | ||||
no bookmarks set | ||||
|
r17264 | |||
test stripping a non-checked-out but bookmarked revision | ||||
|
r20117 | $ hg log --graph | ||
|
r17264 | o changeset: 4:9ba5f110a0b3 | ||
| branch: test | ||||
| tag: tip | ||||
| parent: 2:db815d6d32e6 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: y | ||||
| | ||||
| @ changeset: 3:125c9a1d6df6 | ||||
|/ user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: x | ||||
| | ||||
o changeset: 2:db815d6d32e6 | ||||
| parent: 0:f7b1eb17ad24 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: 2 | ||||
| | ||||
| o changeset: 1:925d80f479bb | ||||
|/ user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: 1 | ||||
| | ||||
o changeset: 0:f7b1eb17ad24 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 0 | ||||
$ hg book should-end-on-two | ||||
$ hg co --clean 4 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
r21404 | (leaving bookmark should-end-on-two) | ||
|
r17264 | $ hg book four | ||
$ hg --config extensions.mq= strip 3 | ||||
saved backup bundle to * (glob) | ||||
should-end-on-two should end up pointing to revision 2, as that's the | ||||
tipmost surviving ancestor of the stripped revision. | ||||
|
r20117 | $ hg log --graph | ||
|
r17264 | @ changeset: 3:9ba5f110a0b3 | ||
| branch: test | ||||
| bookmark: four | ||||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: y | ||||
| | ||||
o changeset: 2:db815d6d32e6 | ||||
| bookmark: should-end-on-two | ||||
| parent: 0:f7b1eb17ad24 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: 2 | ||||
| | ||||
| o changeset: 1:925d80f479bb | ||||
|/ user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: 1 | ||||
| | ||||
o changeset: 0:f7b1eb17ad24 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 0 | ||||
|
r25789 | test non-linear update not clearing active bookmark | ||
$ hg up 1 | ||||
1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
(leaving bookmark four) | ||||
$ hg book drop | ||||
$ hg up -C | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
(leaving bookmark drop) | ||||
$ hg sum | ||||
parent: 2:db815d6d32e6 | ||||
2 | ||||
branch: default | ||||
bookmarks: should-end-on-two | ||||
commit: 2 unknown (clean) | ||||
update: 1 new changesets, 2 branch heads (merge) | ||||
phases: 4 draft | ||||
$ hg book | ||||
drop 1:925d80f479bb | ||||
four 3:9ba5f110a0b3 | ||||
should-end-on-two 2:db815d6d32e6 | ||||
$ hg book -d drop | ||||
$ hg up four | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(activating bookmark four) | ||||
|
r19109 | |||
|
r26676 | no-op update doesn't deactive bookmarks | ||
$ hg up | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg sum | ||||
parent: 3:9ba5f110a0b3 tip | ||||
y | ||||
branch: test | ||||
bookmarks: *four | ||||
commit: 2 unknown (clean) | ||||
update: (current) | ||||
phases: 4 draft | ||||
|
r19109 | test clearing divergent bookmarks of linear ancestors | ||
$ hg bookmark Z -r 0 | ||||
$ hg bookmark Z@1 -r 1 | ||||
$ hg bookmark Z@2 -r 2 | ||||
$ hg bookmark Z@3 -r 3 | ||||
$ hg book | ||||
Z 0:f7b1eb17ad24 | ||||
Z@1 1:925d80f479bb | ||||
Z@2 2:db815d6d32e6 | ||||
|
r19112 | Z@3 3:9ba5f110a0b3 | ||
* four 3:9ba5f110a0b3 | ||||
|
r19109 | should-end-on-two 2:db815d6d32e6 | ||
$ hg bookmark Z | ||||
moving bookmark 'Z' forward from f7b1eb17ad24 | ||||
$ hg book | ||||
* Z 3:9ba5f110a0b3 | ||||
Z@1 1:925d80f479bb | ||||
four 3:9ba5f110a0b3 | ||||
should-end-on-two 2:db815d6d32e6 | ||||
|
r19111 | |||
test clearing only a single divergent bookmark across branches | ||||
$ hg book foo -r 1 | ||||
$ hg book foo@1 -r 0 | ||||
$ hg book foo@2 -r 2 | ||||
$ hg book foo@3 -r 3 | ||||
$ hg book foo -r foo@3 | ||||
$ hg book | ||||
|
r19112 | * Z 3:9ba5f110a0b3 | ||
|
r19111 | Z@1 1:925d80f479bb | ||
|
r19112 | foo 3:9ba5f110a0b3 | ||
|
r19111 | foo@1 0:f7b1eb17ad24 | ||
foo@2 2:db815d6d32e6 | ||||
four 3:9ba5f110a0b3 | ||||
should-end-on-two 2:db815d6d32e6 | ||||