Mercurial > evolve
changeset 5826:8c4b3178b32d mercurial-5.4
test-compat: merge mercurial-5.5 into mercurial-5.4
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 11 Mar 2021 13:18:30 +0800 |
| parents | 60a7ee4b6cda (diff) 9b1bdd68d545 (current diff) |
| children | 664f62e57231 e315f30a4877 |
| files | tests/test-topic-rebase.t |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Thu Mar 11 12:51:00 2021 +0800 +++ b/tests/test-topic-rebase.t Thu Mar 11 13:18:30 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 Mar 11 12:51:00 2021 +0800 +++ b/tests/test-topic-server.t Thu Mar 11 13:18:30 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