Mercurial > evolve
changeset 5798:87006dcf2bb7 stable
doc: change topic phrase 'disappear' to 'fade out'
Change all instances which describe topics as "disappearing" to the more
accurate "fade out" as the information is still available, but no longer
used.
| author | Chuck Tuffli <chuck@tuffli.net> |
|---|---|
| date | Wed, 24 Feb 2021 14:30:21 -0800 |
| parents | aad3ee70a0bb |
| children | a5fdfe3ef09f 5341d7c30e68 |
| files | docs/from-mq.rst docs/tutorial/slides.md hgext3rd/topic/__init__.py tests/test-topic-tutorial.t tests/test-topic.t |
| diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/from-mq.rst Fri Feb 12 13:16:01 2021 -0800 +++ b/docs/from-mq.rst Wed Feb 24 14:30:21 2021 -0800 @@ -50,7 +50,7 @@ Using the topic extension provides another way of looking at your work in progress. Topic branches are lightweight branches which -disappear when changes are finalized. Although the underlying +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``
--- a/docs/tutorial/slides.md Fri Feb 12 13:16:01 2021 -0800 +++ b/docs/tutorial/slides.md Wed Feb 24 14:30:21 2021 -0800 @@ -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.
--- a/hgext3rd/topic/__init__.py Fri Feb 12 13:16:01 2021 -0800 +++ b/hgext3rd/topic/__init__.py Wed Feb 24 14:30:21 2021 -0800 @@ -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
--- a/tests/test-topic-tutorial.t Fri Feb 12 13:16:01 2021 -0800 +++ b/tests/test-topic-tutorial.t Wed Feb 24 14:30:21 2021 -0800 @@ -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
--- a/tests/test-topic.t Fri Feb 12 13:16:01 2021 -0800 +++ b/tests/test-topic.t Wed Feb 24 14:30:21 2021 -0800 @@ -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"