Mercurial > evolve
changeset 6284:abe93cec04a7 mercurial-5.4
test-compat: merge mercurial-5.5 into mercurial-5.4
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 12 Jul 2022 21:10:24 +0400 |
| parents | bb7cead02a23 (diff) b8cc96e7ba99 (current diff) |
| children | fbf0e66d3709 ab052cdaa813 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Tue Jul 12 19:16:48 2022 +0400 +++ b/tests/test-topic-rebase.t Tue Jul 12 21:10:24 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
--- a/tests/test-topic-server.t Tue Jul 12 19:16:48 2022 +0400 +++ b/tests/test-topic-server.t Tue Jul 12 21:10:24 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