# HG changeset patch # User Anton Shestakov # Date 1670517866 -14400 # Node ID ab052cdaa813540d03c61eb6291e5917341ce020 # Parent 0aff320554d28a6b00c1fc6c20e27046bf92fe25# Parent abe93cec04a7906b36d3403e646c23799fe9c2c0 test-compat: merge mercurial-5.5 into mercurial-5.4 diff -r 0aff320554d2 -r ab052cdaa813 tests/test-topic-rebase.t --- a/tests/test-topic-rebase.t Thu Dec 08 20:35:02 2022 +0400 +++ b/tests/test-topic-rebase.t Thu Dec 08 20:44:26 2022 +0400 @@ -114,7 +114,7 @@ merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') switching to topic myotherfeature - unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') + unresolved conflicts (see hg resolve, then hg rebase --continue) [1] Resolve the conflict diff -r 0aff320554d2 -r ab052cdaa813 tests/test-topic-server.t --- a/tests/test-topic-server.t Thu Dec 08 20:35:02 2022 +0400 +++ b/tests/test-topic-server.t Thu Dec 08 20:44:26 2022 +0400 @@ -54,9 +54,9 @@ Enabled extensions: - evolve external * (glob) rebase internal topic external * (glob) + evolve external * (glob) $ hg clone ssh://user@dummy/server client-plain requesting all changes adding changesets @@ -81,8 +81,8 @@ Enabled extensions: + rebase internal evolve external * (glob) - rebase internal Make two commits, with and without a topic, and push them to the server