--- a/tests/test-evolve-noupdate.t Fri Oct 12 15:15:09 2018 +0200
+++ b/tests/test-evolve-noupdate.t Fri Oct 12 15:20:54 2018 +0200
@@ -44,9 +44,9 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo bar > b
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg glog
- @ 5:7ed0642d644b added b
+ @ 6:7ed0642d644b added b
| () draft
| o 4:c41c793e0ef1 added d
| | () draft
@@ -62,15 +62,15 @@
There is 'working directory is now at' message because it didnt changed
$ hg evolve --all --no-update
move:[3] added c
- atop:[5] added b
+ atop:[6] added b
move:[4] added d
$ hg glog
- o 7:b6b20b8eefdc added d
+ o 8:b6b20b8eefdc added d
| () draft
- o 6:7c46f743e62f added c
+ o 7:7c46f743e62f added c
| () draft
- @ 5:7ed0642d644b added b
+ @ 6:7ed0642d644b added b
| () draft
o 1:c7586e2a9264 added a
| () draft
@@ -85,18 +85,18 @@
[1] added a
$ echo bar > a
$ hg amend
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg up 7ed0642d644b
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg glog
- o 8:3d41537b44ca added a
+ o 10:3d41537b44ca added a
| () draft
- | o 7:b6b20b8eefdc added d
+ | o 8:b6b20b8eefdc added d
| | () draft
- | o 6:7c46f743e62f added c
+ | o 7:7c46f743e62f added c
| | () draft
- | @ 5:7ed0642d644b added b
+ | @ 6:7ed0642d644b added b
| | () draft
| x 1:c7586e2a9264 added a
|/ () draft
@@ -104,20 +104,20 @@
() draft
$ hg evolve --all --any --no-update
- move:[5] added b
- atop:[8] added a
- move:[6] added c
- move:[7] added d
+ move:[6] added b
+ atop:[10] added a
+ move:[7] added c
+ move:[8] added d
working directory is now at 12c720cb3782
$ hg glog
- o 11:a74d9f22ba3f added d
+ o 13:a74d9f22ba3f added d
| () draft
- o 10:958f5155e8cd added c
+ o 12:958f5155e8cd added c
| () draft
- @ 9:12c720cb3782 added b
+ @ 11:12c720cb3782 added b
| () draft
- o 8:3d41537b44ca added a
+ o 10:3d41537b44ca added a
| () draft
o 0:8fa14d15e168 added hgignore
() draft