comparison 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
comparison
equal deleted inserted replaced
46071:f4f07cc92a47 46072:69429972ff1f
61 src: '1' -> dst: '1a' * 61 src: '1' -> dst: '1a' *
62 checking for directory renames 62 checking for directory renames
63 resolving manifests 63 resolving manifests
64 branchmerge: True, force: False, partial: False 64 branchmerge: True, force: False, partial: False
65 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 65 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
66 starting 4 threads for background file closing (?)
66 preserving 1a for resolve of 1a 67 preserving 1a for resolve of 1a
67 starting 4 threads for background file closing (?)
68 1a: local copied/moved from 1 -> m (premerge) 68 1a: local copied/moved from 1 -> m (premerge)
69 picked tool ':merge' for 1a (binary False symlink False changedelete False) 69 picked tool ':merge' for 1a (binary False symlink False changedelete False)
70 merging 1a and 1 to 1a 70 merging 1a and 1 to 1a
71 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9 71 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
72 premerge successful 72 premerge successful
84 src: '1' -> dst: '1a' * 84 src: '1' -> dst: '1a' *
85 checking for directory renames 85 checking for directory renames
86 resolving manifests 86 resolving manifests
87 branchmerge: True, force: False, partial: False 87 branchmerge: True, force: False, partial: False
88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b 88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
89 starting 4 threads for background file closing (?)
89 preserving 1 for resolve of 1a 90 preserving 1 for resolve of 1a
90 removing 1 91 removing 1
91 starting 4 threads for background file closing (?)
92 1a: remote moved from 1 -> m (premerge) 92 1a: remote moved from 1 -> m (premerge)
93 picked tool ':merge' for 1a (binary False symlink False changedelete False) 93 picked tool ':merge' for 1a (binary False symlink False changedelete False)
94 merging 1 and 1a to 1a 94 merging 1 and 1a to 1a
95 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9 95 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
96 premerge successful 96 premerge successful