Mercurial > evolve

comparison tests/test-evolve-progress.t @ 6176:32faf1cd209f mercurial-6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: back out changeset 0c052cf84944 CORE-TEST-OUTPUT-UPDATE: 38941a28406a
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 07:14:09 +0300
parents d03f682938ae
children 9a41c3c293ae
comparison
equal deleted inserted replaced
6175:d03f682938ae 6176:32faf1cd209f
122 resolving manifests 122 resolving manifests
123 branchmerge: True, force: True, partial: False 123 branchmerge: True, force: True, partial: False
124 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 124 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
125 starting 4 threads for background file closing (?) 125 starting 4 threads for background file closing (?)
126 preserving a for resolve of a 126 preserving a for resolve of a
127 a: versions differ -> m 127 a: versions differ -> m (premerge)
128 updating: a 1/1 files (100.00%) 128 updating: a 1/1 files (100.00%)
129 picked tool ':merge' for a (binary False symlink False changedelete False) 129 picked tool ':merge' for a (binary False symlink False changedelete False)
130 merging a 130 merging a
131 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b 131 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
132 a: versions differ -> m (merge)
133 updating: a 2/2 files (100.00%)
132 picked tool ':merge' for a (binary False symlink False changedelete False) 134 picked tool ':merge' for a (binary False symlink False changedelete False)
133 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b 135 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b
134 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 136 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
135 unresolved merge conflicts 137 unresolved merge conflicts
136 (see 'hg help evolve.interrupted') 138 (see 'hg help evolve.interrupted')