# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1614423864 -3600
# Node ID a5fdfe3ef09fd9d2666344f2060ef2f321ed930e
# Parent  abbc021c6f68e9b5f5b809509543c3e3df911d14# Parent  87006dcf2bb7a9214872525093d372e3873d4364
branching: merge with stable

diff -r abbc021c6f68 -r a5fdfe3ef09f CHANGELOG
--- a/CHANGELOG	Tue Feb 23 18:34:07 2021 +0800
+++ b/CHANGELOG	Sat Feb 27 12:04:24 2021 +0100
@@ -15,6 +15,11 @@
  * rewind: when user gives only some parts of a fold, include the other parts
    as well, or abort if they are missing from local repo
 
+10.2.1 - in progress
+--------------------
+
+ * doc: document stack as a substitue for MQ's qseries
+
 10.2.0.post1 -- 2021-02-01
 --------------------------
 
diff -r abbc021c6f68 -r a5fdfe3ef09f docs/from-mq.rst
--- a/docs/from-mq.rst	Tue Feb 23 18:34:07 2021 +0800
+++ b/docs/from-mq.rst	Sat Feb 27 12:04:24 2021 +0100
@@ -48,6 +48,27 @@
   [alias]
   wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n'
 
+Using the topic extension provides another way of looking at your
+work in progress. Topic branches are lightweight branches which
+fade out when changes are finalized. Although the underlying
+mechanics are different, both queues and topics help users
+organize and share their unfinished work. The topic extension
+provides the ``stack`` command. Similar to ``qseries``, ``stack``
+lists all changesets in a topic as well as other related
+information.
+
+.. code-block:: console
+
+  $ hg stack
+
+Installing the evolve extension also installs the topic extension. To enable
+it, add the following to your `hgrc` config:
+
+.. code-block:: ini
+
+  [extensions]
+  topic =
+
 hg qnew
 ```````
 
diff -r abbc021c6f68 -r a5fdfe3ef09f docs/tutorial/slides.md
--- a/docs/tutorial/slides.md	Tue Feb 23 18:34:07 2021 +0800
+++ b/docs/tutorial/slides.md	Sat Feb 27 12:04:24 2021 +0100
@@ -761,7 +761,7 @@
 
 But it also has several disadvantages:
 
-- Branches do not disappear once they are merged. You need to explicitely close them with `hg commit --close-branch`.
+- Branches do not fade out once they are merged. You need to explicitely close them with `hg commit --close-branch`.
 - Branches are lost when rebasing them without the `--keepbranches` option of the `hg rebase` command.
 - New branches needs to be explicitly pushed with the `--new-branch` option of the `hg push` command.
 
@@ -1301,7 +1301,7 @@
 
 #### Topic
 
-Topic branches are lightweight branches which disappear when changes are
+Topic branches are lightweight branches which fade out when changes are
 finalized (move to the public phase). They can help users to organise and share
 their unfinished work.
 
diff -r abbc021c6f68 -r a5fdfe3ef09f hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Tue Feb 23 18:34:07 2021 +0800
+++ b/hgext3rd/topic/__init__.py	Sat Feb 27 12:04:24 2021 +0100
@@ -4,7 +4,7 @@
 # GNU General Public License version 2 or any later version.
 """support for topic branches
 
-Topic branches are lightweight branches which disappear when changes are
+Topic branches are lightweight branches which fade out when changes are
 finalized (move to the public phase).
 
 Compared to bookmark, topic is reference carried by each changesets of the
diff -r abbc021c6f68 -r a5fdfe3ef09f tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Tue Feb 23 18:34:07 2021 +0800
+++ b/tests/test-topic-tutorial.t	Sat Feb 27 12:04:24 2021 +0100
@@ -49,7 +49,7 @@
   $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore
 #endif
 
-Topic branches are lightweight branches which disappear when changes are
+Topic branches are lightweight branches which fade out when changes are
 finalized (moved to the public phase). They can help users to organize and share
 their unfinished work.
 
@@ -589,7 +589,7 @@
   o  0:38da43f0a2ea
       Shopping list
 
-The topic information will disappear when we publish the changesets:
+The topic information will fade out when we publish the changesets:
 
   $ hg topics
    * food (2 changesets)
@@ -1113,7 +1113,7 @@
   added 2 changesets with 2 changes to 1 files
   2 new obsolescence markers
 
-The published topic has now disappeared, and the other is now marked as
+The published topic has now faded out, and the other is now marked as
 "behind":
 
   $ hg topics --verbose
diff -r abbc021c6f68 -r a5fdfe3ef09f tests/test-topic.t
--- a/tests/test-topic.t	Tue Feb 23 18:34:07 2021 +0800
+++ b/tests/test-topic.t	Sat Feb 27 12:04:24 2021 +0100
@@ -15,7 +15,7 @@
   $ hg help -e topic
   topic extension - support for topic branches
   
-  Topic branches are lightweight branches which disappear when changes are
+  Topic branches are lightweight branches which fade out when changes are
   finalized (move to the public phase).
   
   Compared to bookmark, topic is reference carried by each changesets of the
@@ -690,7 +690,7 @@
   |
 
 query is not an open topic, so when we clear the current topic it'll
-disappear:
+fade out:
 
   $ hg topics --clear
   clearing empty topic "query"