Mercurial > evolve
diff docs/tutorial/slides.md @ 4615:8406d9b06130
docs: change `precursors` references to `predecessors`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 27 Apr 2019 19:32:03 -0400 |
parents | aad37ffd7d58 |
children | a78310b900e3 |
line wrap: on
line diff
--- a/docs/tutorial/slides.md Sat Apr 27 14:42:48 2019 -0400 +++ b/docs/tutorial/slides.md Sat Apr 27 19:32:03 2019 -0400 @@ -275,7 +275,7 @@ Notice the `x` in the log output which shows that a changeset is hidden. -In addition to hiding the original changeset, we are also storing additional information which is recording the relation between a changeset, the **precursor** and its **successor**. It basically stores the information that the commit **X** was rewritten into the commit **Y** by the user **U** at the date **D**. This piece of information is stored in something called an **obsolescence marker**. It will be displayed like this: +In addition to hiding the original changeset, we are also storing additional information which is recording the relation between a changeset, the **predecessor** and its **successor**. It basically stores the information that the commit **X** was rewritten into the commit **Y** by the user **U** at the date **D**. This piece of information is stored in something called an **obsolescence marker**. It will be displayed like this: ~~~graphviz-file graphs/fix-bug-3.dot @@ -285,7 +285,7 @@ ##### Rebase -**Successors** don't need to share anything with their **precursor**. They could have a different description message, user, date or even parents. +**Successors** don't need to share anything with their **predecessor**. They could have a different description message, user, date or even parents. Let's look at our earlier rebase example. The status before the rebase was: @@ -345,7 +345,7 @@ output/under-the-hood-amend-after-obslog-patch.log ~~~ -Obslog works both ways, as it can display **precursors** and **successors** with the `--all` option: +Obslog works both ways, as it can display **predecessors** and **successors** with the `--all` option: ```raw-file output/under-the-hood-amend-after-obslog-no-all.log @@ -858,7 +858,7 @@ output/edit-mid-stack-after-stack.log ``` -`hg stack` tries to simplify the view for you. We have amended **b2**, and **b3**'s parent is the precursor version of **b2**, so it is not stable any more. It is now **orphan**. +`hg stack` tries to simplify the view for you. We have amended **b2**, and **b3**'s parent is the predecessor version of **b2**, so it is not stable any more. It is now **orphan**. For once, let's use log to see in detail in which situation we are: