Mercurial > evolve

comparison tests/test-evolve-progress.t @ 5600:d77d61c9e5e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 15 Oct 2020 19:46:38 +0200
parents 4993cdeef79c fd2d61769bd0
children eb326644dc29
comparison
equal deleted inserted replaced
5599:ba8bc1b0acd2 5600:d77d61c9e5e9
121 evolve: 1/3 changesets (33.33%) 121 evolve: 1/3 changesets (33.33%)
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 preserving a for resolve of a 125 preserving a for resolve of a
126 starting 4 threads for background file closing (?)
126 a: versions differ -> m (premerge) 127 a: versions differ -> m (premerge)
127 updating: a 1/1 files (100.00%) 128 updating: a 1/1 files (100.00%)
128 picked tool ':merge' for a (binary False symlink False changedelete False) 129 picked tool ':merge' for a (binary False symlink False changedelete False)
129 merging a 130 merging a
130 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b 131 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b