--- a/tests/test-evolve-topic.t Thu Oct 25 18:51:55 2018 +0200
+++ b/tests/test-evolve-topic.t Wed Oct 24 19:38:02 2018 +0530
@@ -381,3 +381,63 @@
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[s3] add eee
+
+Test showing that currently stackaliases does not support --continue case
+-------------------------------------------------------------------------
+ $ hg up 18
+ switching to topic bar
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg evolve --all
+ move:[s2] add ggg
+ atop:[s1] add fff
+ move:[s3] add hhh
+ move:[s4] add iii
+ move:[s5] add jjj
+ working directory is now at 38a82cbb794a
+ $ hg up 18
+ 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
+ $ echo "changes in hhh" > hhh
+ $ hg add hhh
+ $ hg ci --amend
+ 4 new orphan changesets
+ $ hg log -G
+ @ 26 - {bar} 2c295936ac04 add fff (draft)
+ |
+ | * 25 - {bar} 38a82cbb794a add jjj (draft)
+ | |
+ | * 24 - {bar} 4a44eba0fdb3 add iii (draft)
+ | |
+ | * 23 - {bar} 7acd9ea5d677 add hhh (draft)
+ | |
+ | * 22 - {bar} 735c7bd8f133 add ggg (draft)
+ | |
+ | x 18 - {bar} 793eb6370b2d add fff (draft)
+ |/
+ o 12 - {foo} 42b49017ff90 add eee (draft)
+ |
+ o 10 - {foo} d9cacd156ffc add ddd (draft)
+ |
+ o 2 - {foo} cced9bac76e3 add ccc (draft)
+ |
+ o 1 - {} a4dbed0837ea add bbb (draft)
+ |
+ o 0 - {} 199cc73e9a0b add aaa (draft)
+
+ $ hg evolve --all
+ move:[s2] add ggg
+ atop:[s1] add fff
+ move:[s3] add hhh
+ merging hhh
+ warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark')
+ fix conflicts and see `hg help evolve.interrupted`
+ [1]
+ $ echo "resolved hhh" > hhh
+ $ hg resolve --mark hhh
+ (no more unresolved files)
+ continue: hg evolve --continue
+ $ hg evolve --continue
+ evolving 23:7acd9ea5d677 "add hhh"
+ move:[24] add iii
+ atop:[28] add hhh
+ move:[25] add jjj
+ working directory is now at 119e4c126fb2