# HG changeset patch # User Anton Shestakov # Date 1645503249 -10800 # Node ID 32faf1cd209f01ea35adf8b67e5502398c0bb212 # Parent d03f682938ae2d195e00b765a37ea8b460bc7496 test-compat: back out changeset 0c052cf84944 CORE-TEST-OUTPUT-UPDATE: 38941a28406a diff -r d03f682938ae -r 32faf1cd209f tests/test-evolve-content-divergent-interrupted.t --- 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 diff -r d03f682938ae -r 32faf1cd209f tests/test-evolve-progress.t --- 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')