diff tests/test-topic.t @ 6936:a239ea1dfacb default tip

branching: merge with stable

--- a/tests/test-topic.t	Sat Oct 26 11:19:50 2024 +0400
+++ b/tests/test-topic.t	Fri Nov 22 16:53:42 2024 +0400
@@ -171,45 +171,47 @@
    stack         list all changesets in a topic and other information
   
   (use 'hg help -v topic' to show built-in aliases and global options)
+
+#if hg69
   $ hg help topics
   hg topics [OPTION]... [-r REV]... [TOPIC]
   
   View current topic, set current topic, change topic for a set of revisions, or
   see all topics.
   
-      Clear topic on existing topiced revisions:
+  Clear topic on existing topiced revisions:
   
-        hg topics --rev <related revset> --clear
+    hg topics --rev <related revset> --clear
   
-      Change topic on some revisions:
+  Change topic on some revisions:
   
-        hg topics <newtopicname> --rev <related revset>
+    hg topics <newtopicname> --rev <related revset>
   
-      Clear current topic:
+  Clear current topic:
   
-        hg topics --clear
+    hg topics --clear
   
-      Set current topic:
+  Set current topic:
   
-        hg topics <topicname>
+    hg topics <topicname>
   
-      List of topics:
+  List of topics:
   
-        hg topics
+    hg topics
   
-      List of topics sorted according to their last touched time displaying last
-      touched time and the user who last touched the topic:
+  List of topics sorted according to their last touched time displaying last
+  touched time and the user who last touched the topic:
   
-        hg topics --age
+    hg topics --age
   
-      The active topic (if any) will be prepended with a "*".
+  The active topic (if any) will be prepended with a "*".
   
-      The '--current' flag helps to take active topic into account. For example,
-      if you want to set the topic on all the draft changesets to the active
-      topic, you can do: 'hg topics -r "draft()" --current'
+  The '--current' flag helps to take active topic into account. For example, if
+  you want to set the topic on all the draft changesets to the active topic, you
+  can do: 'hg topics -r "draft()" --current'
   
-      The --verbose version of this command display various information on the
-      state of each topic.
+  The --verbose version of this command display various information on the state
+  of each topic.
   
   options ([+] can be repeated):
   
@@ -221,6 +223,8 @@
    -T --template TEMPLATE display with template
   
   (some details hidden, use --verbose to show complete help)
+#endif
+
   $ hg topics
 
 Test topics interaction with evolution: