changeset 6587:8e3d4be64724 mercurial-5.4

test-compat: merge mercurial-5.5 into mercurial-5.4
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 14 Oct 2023 14:41:41 -0300
parents b0dc6a03e888 (current diff) 49a18b13ce71 (diff)
children 3194a80b96d3 4018000cdb3e
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-topic-rebase.t	Sat Oct 14 14:15:58 2023 -0300
+++ b/tests/test-topic-rebase.t	Sat Oct 14 14:41:41 2023 -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	Sat Oct 14 14:15:58 2023 -0300
+++ b/tests/test-topic-server.t	Sat Oct 14 14:41:41 2023 -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