Mercurial > hg
comparison tests/test-up-local-change.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 | c4f14db3da1d |
| children | dc00324e80f4 |
comparison
equal
deleted
inserted
replaced
| 46071:f4f07cc92a47 | 46072:69429972ff1f |
|---|---|
| 68 resolving manifests | 68 resolving manifests |
| 69 branchmerge: False, force: False, partial: False | 69 branchmerge: False, force: False, partial: False |
| 70 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a | 70 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
| 71 b: other deleted -> r | 71 b: other deleted -> r |
| 72 removing b | 72 removing b |
| 73 starting 4 threads for background file closing (?) | |
| 73 preserving a for resolve of a | 74 preserving a for resolve of a |
| 74 starting 4 threads for background file closing (?) | |
| 75 a: versions differ -> m (premerge) | 75 a: versions differ -> m (premerge) |
| 76 picked tool 'true' for a (binary False symlink False changedelete False) | 76 picked tool 'true' for a (binary False symlink False changedelete False) |
| 77 merging a | 77 merging a |
| 78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | 78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
| 79 a: versions differ -> m (merge) | 79 a: versions differ -> m (merge) |