--- a/tests/test-obshistory.t Sun Jan 14 00:02:40 2018 -0800
+++ b/tests/test-obshistory.t Tue Jan 16 14:08:54 2018 +0100
@@ -56,6 +56,7 @@
[255]
$ hg update --hidden "desc(A0)"
updating to a hidden changeset 471f378eab4c
+ (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test output with pruned commit
@@ -118,6 +119,7 @@
[255]
$ hg up --hidden -r 'desc(B0)'
updating to a hidden changeset 0dec01379d3b
+ (hidden revision '0dec01379d3b' is pruned)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test output with splitted commit
@@ -194,6 +196,7 @@
[255]
$ hg update --hidden 'min(desc(A0))'
updating to a hidden changeset 471597cad322
+ (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test output with lots of splitted commit
@@ -292,6 +295,7 @@
[255]
$ hg update --hidden 'min(desc(A0))'
updating to a hidden changeset de7290d8b885
+ (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test output with folded commit
@@ -370,6 +374,7 @@
[255]
$ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
+ (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg update 0dec01379d3b
abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
@@ -377,6 +382,7 @@
[255]
$ hg update --hidden 'desc(B0)'
updating to a hidden changeset 0dec01379d3b
+ (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test output with divergence
@@ -411,6 +417,7 @@
$ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
+ (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m "A2"
2 new content-divergent changesets
@@ -450,6 +457,7 @@
[255]
$ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
+ (hidden revision '471f378eab4c' has diverged)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test output with amended + folded commit
@@ -544,9 +552,11 @@
[255]
$ hg update --hidden 'desc(A0)'
updating to a hidden changeset 471f378eab4c
+ (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg update --hidden 0dec01379d3b
updating to a hidden changeset 0dec01379d3b
+ (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update 0dec01379d3b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved