--- a/tests/test-evolve-content-divergent-stack.t	Mon Nov 25 21:28:52 2019 +0530
+++ b/tests/test-evolve-content-divergent-stack.t	Wed Nov 27 12:34:19 2019 +0530
@@ -389,8 +389,48 @@
   $ hg res -m
   (no more unresolved files)
   continue: hg evolve --continue
-  $ hg evolve --continue 2>&1 | grep "KeyError"
-  KeyError: 'resolutionparent'
+  $ hg evolve --continue
+  evolving 11:6eb54b5af3fb "added b"
+  rebasing "other" content-divergent changeset d5f148423c16 on 119989a4317e
+  merging b
+  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
+  [1]
+
+  $ echo b > b
+  $ hg res -m
+  (no more unresolved files)
+  continue: hg evolve --continue
+  $ hg evolve --continue
+  evolving 6:d5f148423c16 "added b"
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  merge:[12] added c
+  with: [7] added c
+  base: [3] added c
+  rebasing "divergent" content-divergent changeset 8ed612937375 on 646bd3372ee7
+  rebasing "other" content-divergent changeset 3ce4be6d8e5e on 646bd3372ee7
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  merge:[13] added d
+  with: [8] added d
+  base: [4] added d
+  rebasing "divergent" content-divergent changeset d45f050514c2 on 67abc597e636
+  rebasing "other" content-divergent changeset c72d2885eb51 on 67abc597e636
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  working directory is now at 119989a4317e
+  $ hg glog
+  o  25:5e2572194f59 added d
+  |   () [default] draft
+  o  22:67abc597e636 added c
+  |   () [default] draft
+  o  19:646bd3372ee7 added b
+  |   () [default] draft
+  @  16:119989a4317e watbar to a
+  |   () [default] draft
+  o  9:2228e3b74514 add newfile
+  |   () [default] draft
+  o  0:8fa14d15e168 added hgignore
+      () [default] draft
 
   $ cd ..