Mercurial > evolve
changeset 6067:4599953d9971 mercurial-5.4
test-compat: merge mercurial-5.5 into mercurial-5.4
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Oct 2021 12:10:18 +0300 |
| parents | 34f5c849fc1d (current diff) 0dc06a569791 (diff) |
| children | d3453ef71ce8 6c207b5b1359 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Tue Oct 12 11:53:21 2021 +0300 +++ b/tests/test-topic-rebase.t Tue Oct 12 12:10:18 2021 +0300 @@ -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 Tue Oct 12 11:53:21 2021 +0300 +++ b/tests/test-topic-server.t Tue Oct 12 12:10:18 2021 +0300 @@ -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