Mercurial > evolve
changeset 5759:60a7ee4b6cda mercurial-5.4
test-compat: merge mercurial-5.5 into mercurial-5.4
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 30 Jan 2021 20:42:49 +0800 |
| parents | 552efcc2cc30 (current diff) 72d88e491a19 (diff) |
| children | 6ce036cb7fd4 8c4b3178b32d |
| 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 Sat Jan 30 20:32:38 2021 +0800 +++ b/tests/test-topic-rebase.t Sat Jan 30 20:42:49 2021 +0800 @@ -127,7 +127,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 Sat Jan 30 20:32:38 2021 +0800 +++ b/tests/test-topic-server.t Sat Jan 30 20:42:49 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