diff tests/test-issue672.t @ 46072:69429972ff1f

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 17e12938f8e7
children 38941a28406a
line wrap: on
line diff
--- a/tests/test-issue672.t	Mon Dec 07 20:57:50 2020 -0500
+++ b/tests/test-issue672.t	Mon Dec 07 20:32:05 2020 -0500
@@ -63,8 +63,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
+  starting 4 threads for background file closing (?)
    preserving 1a for resolve of 1a
-  starting 4 threads for background file closing (?)
    1a: local copied/moved from 1 -> m (premerge)
   picked tool ':merge' for 1a (binary False symlink False changedelete False)
   merging 1a and 1 to 1a
@@ -86,9 +86,9 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
+  starting 4 threads for background file closing (?)
    preserving 1 for resolve of 1a
   removing 1
-  starting 4 threads for background file closing (?)
    1a: remote moved from 1 -> m (premerge)
   picked tool ':merge' for 1a (binary False symlink False changedelete False)
   merging 1 and 1a to 1a