--- a/tests/test-topic-stack.t	Mon Dec 24 17:47:29 2018 +0100
+++ b/tests/test-topic-stack.t	Tue Jan 22 12:55:09 2019 -0500
@@ -228,8 +228,52 @@
   s1: c_c
   s0^ c_b (base)
 
+merge case (displaying info about external)
+-------------------------------------------
+
+  $ hg up default
+  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
+  $ hg topics zzz
+  marked working directory as topic: zzz
+  $ echo zzz > zzz
+  $ hg add zzz
+  $ hg commit -m zzz_a
+  active topic 'zzz' grew its first changeset
+  (see 'hg help topics' for more information)
+  $ hg merge foo
+  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg commit -m "merged foo"
+
+stack -m display data about child
+
+  $ hg stack foo
+  ### topic: foo
+  ### target: default (branch)
+  s4: c_f
+  s3: c_e
+  s2: c_d
+  s1: c_c
+  s0^ c_b (base)
+
+  $ hg stack foo --children
+  ### topic: foo
+  ### target: default (branch)
+  s4: c_f (external-children)
+  s3: c_e
+  s2: c_d
+  s1: c_c
+  s0^ c_b (base)
+
 error case, nothing to list
 
+  $ hg strip --config extensions.strip= t1 --no-backup
+  0 files updated, 0 files merged, 5 files removed, 0 files unresolved
+
+  $ hg up foo
+  switching to topic foo
+  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
   $ hg topic --clear
   $ hg stack
   ### target: default (branch)
@@ -494,7 +538,7 @@
   $ hg topic foobar -r 'desc(c_e) + desc(c_D)'
   switching to topic foobar
   4 new orphan changesets
-  changed topic on 2 changes
+  changed topic on 2 changesets to "foobar"
   $ hg log -G
   @  17 default {foobar} draft c_D
   |
@@ -849,7 +893,7 @@
   > y
   > y
   > n
-  > y
+  > c
   > EOF
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   adding Z
@@ -866,7 +910,7 @@
   new file mode 100644
   examine changes to 'ggg'? [Ynesfdaq?] n
   
-  Done splitting? [yN] y
+  continue splitting? [Ycdq?] c
 
   $ hg --config extensions.evolve= obslog --all
   o  dde94df880e9 (21) c_G