--- a/tests/test-touch.t Tue Jan 22 12:55:09 2019 -0500
+++ b/tests/test-touch.t Tue Jan 22 12:57:25 2019 -0500
@@ -32,8 +32,6 @@
$ hg add b
$ hg commit -m ab --amend
$ hg up --hidden 1
- updating to a hidden changeset [0-9a-f]{12} (re)
- (hidden revision '*' was rewritten as: *) (glob)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (*) (glob)
(use 'hg evolve' to update to its successor: *) (glob)
@@ -46,11 +44,10 @@
[1] a
reviving this changeset will create divergence unless you make a duplicate.
(a)llow divergence or (d)uplicate the changeset? a
- 2 new content-divergent changesets
$ hg log -G
@ 3:[0-9a-f]{12} a (re)
- \* 2:[0-9a-f]{12} ab (re)
+ o 2:[0-9a-f]{12} ab (re)
$ hg prune 3
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -109,12 +106,11 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg touch
- 1 new orphan changesets
$ hg log -G --hidden
@ 11:[0-9a-f]{12} gna1 (re)
|
- . \* 10:[0-9a-f]{12} move (re)
+ . o 10:[0-9a-f]{12} move (re)
| |
. x 9:[0-9a-f]{12} gna1 (re)
|/
@@ -147,14 +143,12 @@
check that the --duplicate option does not create divergence
$ hg touch --duplicate 10 --hidden
- 1 new orphan changesets
check that reviving a changeset with no successor does not show the prompt
$ hg prune 13
1 changesets pruned
$ hg touch 13 --hidden --note "testing with no successor"
- 1 new orphan changesets
$ hg obslog -r 13 --hidden
x [0-9a-f]{12} (.*) move (re)
pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)