diff tests/test-topic.t @ 5640:8d93e7fc0daa mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

# no-check-commit

--- a/tests/test-topic.t	Sat Oct 31 19:43:46 2020 +0800
+++ b/tests/test-topic.t	Sat Oct 31 20:02:03 2020 +0800
@@ -166,15 +166,10 @@
   
   list of commands:
   
-  Change organization:
-  
+   stack         list all changesets in a topic and other information
    topics        View current topic, set current topic, change topic for a set
                  of revisions, or see all topics.
   
-  Change navigation:
-  
-   stack         list all changesets in a topic and other information
-  
   (use 'hg help -v topic' to show built-in aliases and global options)
   $ hg help topics
   hg topics [OPTION]... [-r REV]... [TOPIC]
@@ -218,12 +213,11 @@
   
   options ([+] can be repeated):
   
-      --clear             clear active topic if any
-   -r --rev REV [+]       revset of existing revisions
-   -l --list              show the stack of changeset in the topic
-      --age               show when you last touched the topics
-      --current           display the current topic only
-   -T --template TEMPLATE display with template
+      --clear       clear active topic if any
+   -r --rev REV [+] revset of existing revisions
+   -l --list        show the stack of changeset in the topic
+      --age         show when you last touched the topics
+      --current     display the current topic only
   
   (some details hidden, use --verbose to show complete help)
   $ hg topics
@@ -674,7 +668,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  new changesets 0469d521db49 (1 drafts)
+  new changesets 0469d521db49
   (run 'hg heads' to see heads)
   $ hg topics
      fran  (1 changesets)