Read about our upcoming Code of Conduct on this issue

Commit e141caec authored by Chuck Tuffli's avatar Chuck Tuffli
Browse files

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.

--HG--
branch : stable
parent aad3ee70a0bb
Pipeline #18503 passed with stage
in 6 minutes and 57 seconds
......@@ -50,7 +50,7 @@ This will result in something like
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``
......
......@@ -761,7 +761,7 @@ This solution has several advantages:
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 @@ $> hg topics
#### 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.
......
......@@ -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
......
......@@ -49,7 +49,7 @@ This Mercurial configuration example is used for testing.
$ . "$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 @@ There exists a template keyword named "topic" which can be used
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 @@ branch head as we just saw in the previous case):
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
......
......@@ -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 @@ We can pull in the draft-phase change and we get the new topic
|
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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment