Commit b8949521 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

tests: demonstrate prune --pair not moving bookmark correctly

After `mkcommit n2` line the bookmark is on the correct changeset, but when we
prune --pair the two newly created changesets (revs 13 and 14), the bookmark
gets moved to their ancestor (rev 0). Instead, it should've moved to the last
of their successors (rev 12).
parent a9cf0ba6e6c7
......@@ -229,7 +229,7 @@
814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
two old, two new with --pair
two old, two new with --pair (also test bookmark move)
$ hg up 0
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
......@@ -233,6 +233,7 @@
$ hg up 0
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ hg bookmark prune-pair-book
$ mkcommit n1
created new head
$ mkcommit n2
......@@ -252,8 +253,12 @@
354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
$ hg log --hidden -r 'desc("add n2") + desc("add nE") + bookmark("prune-pair-book")'
14:21b6f2f1cece[] (obsolete/draft) add n2
12:6e8148413dd5[] (draft) add nE
0:1f0dee641bb7[BABAR prune-pair-book] (public) add a
test hg strip replacement
$ hg up 10
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
......@@ -255,8 +260,9 @@
test hg strip replacement
$ hg up 10
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark prune-pair-book)
$ mkcommit n1
created new head
$ mkcommit n2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment