Mercurial > hg

diff tests/test-up-local-change.t @ 46072:69429972ff1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: correct the output order about starting a background thread for Windows I didn't track down where this change occurred. I assume it's related to some buffering changes, and/or an explicit flush somewhere. Differential Revision: https://phab.mercurial-scm.org/D9539
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 07 Dec 2020 20:32:05 -0500
parents c4f14db3da1d
children dc00324e80f4
line wrap: on
line diff
--- a/tests/test-up-local-change.t	Mon Dec 07 20:57:50 2020 -0500
+++ b/tests/test-up-local-change.t	Mon Dec 07 20:32:05 2020 -0500
@@ -70,8 +70,8 @@
    ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
    b: other deleted -> r
   removing b
+  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)
   picked tool 'true' for a (binary False symlink False changedelete False)
   merging a