Mercurial > public > mercurial-scm > hg

diff tests/test-merge-commit.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 91a0bc50b288
children 38941a28406a
line wrap: on
line diff
--- a/tests/test-merge-commit.t	Mon Dec 07 20:57:50 2020 -0500
+++ b/tests/test-merge-commit.t	Mon Dec 07 20:32:05 2020 -0500
@@ -70,8 +70,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
+  starting 4 threads for background file closing (?)
    preserving bar for resolve of bar
-  starting 4 threads for background file closing (?)
    bar: versions differ -> m (premerge)
   picked tool ':merge' for bar (binary False symlink False changedelete False)
   merging bar
@@ -157,8 +157,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
+  starting 4 threads for background file closing (?)
    preserving bar for resolve of bar
-  starting 4 threads for background file closing (?)
    bar: versions differ -> m (premerge)
   picked tool ':merge' for bar (binary False symlink False changedelete False)
   merging bar