Mercurial > public > mercurial-scm > evolve

changeset 6995:88355b96b627 mercurial-5.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.5 into mercurial-5.4
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 06 Feb 2025 11:57:29 +0100
parents c606641aa9de (diff) dc135f90d184 (current diff)
children 51f8be663dd9 7fa85c1d512b
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-topic-rebase.t	Wed Feb 05 23:29:59 2025 +0100
+++ b/tests/test-topic-rebase.t	Thu Feb 06 11:57:29 2025 +0100
@@ -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	Wed Feb 05 23:29:59 2025 +0100
+++ b/tests/test-topic-server.t	Thu Feb 06 11:57:29 2025 +0100
@@ -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