Mercurial > evolve

diff tests/test-evolve-progress.t @ 6106:0c052cf84944

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update for the removal of preresolve() CORE-TEST-OUTPUT-UPDATE: 38941a28406a
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 10 Dec 2021 13:29:16 +0300
parents 85a16667f19b
children cb5e056048d0
line wrap: on
line diff
--- a/tests/test-evolve-progress.t	Mon Nov 22 15:47:09 2021 +0530
+++ b/tests/test-evolve-progress.t	Fri Dec 10 13:29:16 2021 +0300
@@ -124,13 +124,11 @@
    ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
   starting 4 threads for background file closing (?)
    preserving a for resolve of a
-   a: versions differ -> m (premerge)
+   a: versions differ -> m
   updating: a 1/1 files (100.00%)
   picked tool ':merge' for a (binary False symlink False changedelete False)
   merging a
   my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
-   a: versions differ -> m (merge)
-  updating: a 2/2 files (100.00%)
   picked tool ':merge' for a (binary False symlink False changedelete False)
   my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')