Mercurial > evolve
changeset 6176:32faf1cd209f mercurial-6.0
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 | 5b3a757e4c32 |
| files | tests/test-evolve-content-divergent-interrupted.t tests/test-evolve-progress.t |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t Tue Feb 22 07:13:41 2022 +0300 +++ b/tests/test-evolve-content-divergent-interrupted.t Tue Feb 22 07:14:09 2022 +0300 @@ -383,8 +383,8 @@ $ hg evolve -c evolving 8:a8673909e314 "added d" merging a + merging d warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 2 files unresolved unresolved merge conflicts
--- a/tests/test-evolve-progress.t Tue Feb 22 07:13:41 2022 +0300 +++ b/tests/test-evolve-progress.t Tue Feb 22 07:14:09 2022 +0300 @@ -124,11 +124,13 @@ ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 starting 4 threads for background file closing (?) preserving a for resolve of a - a: versions differ -> m + a: versions differ -> m (premerge) updating: a 1/1 files (100.00%) picked tool ':merge' for a (binary False symlink False changedelete False) merging a my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b + a: versions differ -> m (merge) + updating: a 2/2 files (100.00%) picked tool ':merge' for a (binary False symlink False changedelete False) my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b warning: conflicts while merging a! (edit, then use 'hg resolve --mark')