Mercurial > hg
comparison tests/test-double-merge.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 |
comparison
equal
deleted
inserted
replaced
46071:f4f07cc92a47 | 46072:69429972ff1f |
---|---|
33 src: 'foo' -> dst: 'bar' * | 33 src: 'foo' -> dst: 'bar' * |
34 checking for directory renames | 34 checking for directory renames |
35 resolving manifests | 35 resolving manifests |
36 branchmerge: True, force: False, partial: False | 36 branchmerge: True, force: False, partial: False |
37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 | 37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
38 starting 4 threads for background file closing (?) | |
38 preserving foo for resolve of bar | 39 preserving foo for resolve of bar |
39 preserving foo for resolve of foo | 40 preserving foo for resolve of foo |
40 starting 4 threads for background file closing (?) | |
41 bar: remote copied from foo -> m (premerge) | 41 bar: remote copied from foo -> m (premerge) |
42 picked tool ':merge' for bar (binary False symlink False changedelete False) | 42 picked tool ':merge' for bar (binary False symlink False changedelete False) |
43 merging foo and bar to bar | 43 merging foo and bar to bar |
44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc | 44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
45 premerge successful | 45 premerge successful |