Mercurial > evolve
changeset 5941:52902ca0ca42 mercurial-5.4
test-compat: merge mercurial-5.5 into mercurial-5.4
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 27 May 2021 23:25:57 +0800 |
| parents | e315f30a4877 (diff) db70cc02a7c4 (current diff) |
| children | 92a53d091701 0dc06a569791 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Thu May 27 23:18:19 2021 +0800 +++ b/tests/test-topic-rebase.t Thu May 27 23:25:57 2021 +0800 @@ -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
--- a/tests/test-topic-server.t Thu May 27 23:18:19 2021 +0800 +++ b/tests/test-topic-server.t Thu May 27 23:25:57 2021 +0800 @@ -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