Mercurial > evolve

diff tests/test-evolve-topic.t @ 6181:e6ae5af97683 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 08:19:44 +0300
parents c0921b5277a0
children 1328195f76a9
line wrap: on
line diff
--- a/tests/test-evolve-topic.t	Tue Feb 22 08:00:24 2022 +0300
+++ b/tests/test-evolve-topic.t	Tue Feb 22 08:19:44 2022 +0300
@@ -332,9 +332,9 @@
 different topic
 
   $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
-  rebasing 16:d2dc89c57700 bar "add iii"
+  rebasing 16:d2dc89c57700 "add iii" (bar)
   1 new orphan changesets
-  rebasing 17:9bf430c106b7 bar "add jjj"
+  rebasing 17:9bf430c106b7 "add jjj" (bar)
   1 new orphan changesets
   $ hg log -Gr 42b49017ff90::
   *  21 - {bar} 7542e76aba2c add jjj (draft)
@@ -422,7 +422,7 @@
   warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
   $ echo "resolved hhh" > hhh
   $ hg resolve --mark hhh
   (no more unresolved files)