--- a/tests/test-rewind.t Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-rewind.t Wed Jun 05 17:56:44 2019 +0200
@@ -261,20 +261,19 @@
`````````````
$ hg rewind --hidden --to 'desc("c_B0")' --as-divergence
- 2 new content-divergent changesets
rewinded to 1 changesets
$ hg debugobsolete
7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
$ hg obslog --rev 'desc("c_B0")'
- * 48acf2c0d9c8 (4) c_B0
+ o 48acf2c0d9c8 (4) c_B0
|
x 7e594302a05d (2) c_B0
rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
rewritten(meta, date) as 48acf2c0d9c8 using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
$ hg log -G
- * changeset: 4:48acf2c0d9c8
+ o changeset: 4:48acf2c0d9c8
| tag: tip
| parent: 1:579f120ba918
| user: test
@@ -300,7 +299,7 @@
summary: c_ROOT
$ hg log -G --hidden
- * changeset: 4:48acf2c0d9c8
+ o changeset: 4:48acf2c0d9c8
| tag: tip
| parent: 1:579f120ba918
| user: test
@@ -660,7 +659,6 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo AA >> A
$ hg amend -m 'c_A1'
- 1 new orphan changesets
$ hg evolve --all --update
move:[2] c_B0
atop:[3] c_A1
@@ -702,7 +700,6 @@
`````````````
$ hg rewind --hidden --to 'min(desc(c_B0))' --exact
- 1 new orphan changesets
rewinded to 1 changesets
(1 changesets obsoleted)
working directory is now at 96622b0702dd