Mercurial > evolve

comparison tests/test-evolve-progress.t @ 5565:fd2d61769bd0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: conditonalize a Windows only output in test-evolve-progress.t
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 17 Sep 2020 23:41:14 -0400
parents 4da1d21231ae
children d77d61c9e5e9 0d5c344c0ba4
comparison
equal deleted inserted replaced
5549:d83b24d38853 5565:fd2d61769bd0
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