Mercurial > evolve

diff tests/test-evolve.t @ 5747:8e4f6354b316 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: back out changeset b3d9e6c805d6
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 28 Jan 2021 18:48:36 +0800
parents 61d2f1cf90f0
children f60f1ded1a20
line wrap: on
line diff
--- a/tests/test-evolve.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve.t	Thu Jan 28 18:48:36 2021 +0800
@@ -645,7 +645,7 @@
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts (see hg help resolve)
-  [240]
+  [1]
   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
   7:a5bfd90a2f29 
   $ echo 3 > 1
@@ -1411,7 +1411,7 @@
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ glog -r "desc('add unstableifparentisfolded')::" --hidden
   @  33:b9acdb1af6d5@default(draft) will be evolved safely