Mercurial > evolve
changeset 6252:bb7cead02a23 mercurial-5.4
test-compat: merge mercurial-5.5 into mercurial-5.4
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 25 Apr 2022 23:30:39 +0400 |
| parents | a29f4704d4ad (current diff) 9cb94967890b (diff) |
| children | 8643272ade4c abe93cec04a7 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Mon Apr 25 22:47:26 2022 +0400 +++ b/tests/test-topic-rebase.t Mon Apr 25 23:30:39 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 Mon Apr 25 22:47:26 2022 +0400 +++ b/tests/test-topic-server.t Mon Apr 25 23:30:39 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