Mercurial > evolve

diff tests/test-evolve-progress.t @ 6095:85a16667f19b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: move a windows message up, to where it appears on heptapod ci I'm assuming something changed since fd2d61769bd0 and this line appears at the new place, but if it goes back to the old place we'll need to duplicate it.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 18 Nov 2021 17:36:18 +0300
parents 61d2f1cf90f0
children 0c052cf84944
line wrap: on
line diff
--- a/tests/test-evolve-progress.t	Thu Nov 18 17:29:20 2021 +0300
+++ b/tests/test-evolve-progress.t	Thu Nov 18 17:36:18 2021 +0300
@@ -122,8 +122,8 @@
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
+  starting 4 threads for background file closing (?)
    preserving a for resolve of a
-  starting 4 threads for background file closing (?)
    a: versions differ -> m (premerge)
   updating: a 1/1 files (100.00%)
   picked tool ':merge' for a (binary False symlink False changedelete False)