Mercurial > public > mercurial-scm > evolve
comparison docs/tutorial/slides.md @ 4616:a78310b900e3
docs: change `troubles` references to `instability`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary. There are a couple
instances of 'troublesome' which probably need a word, as deriviatives of
'instability' didn't really fit. At least some of these are in the unlinked
obs-terms.rst page.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 27 Apr 2019 19:42:42 -0400 |
| parents | 8406d9b06130 |
| children | 803d32f4e498 |
comparison
equal
deleted
inserted
replaced
| 4615:8406d9b06130 | 4616:a78310b900e3 |
|---|---|
| 1128 | 1128 |
| 1129 <!-- #### Deroulement | 1129 <!-- #### Deroulement |
| 1130 | 1130 |
| 1131 À deux: | 1131 À deux: |
| 1132 | 1132 |
| 1133 - troubles, divergence, orphan | 1133 - instability, divergence, orphan |
| 1134 - troubles visualization | 1134 - instability visualization |
| 1135 - troubles resolution | 1135 - instability resolution |
| 1136 - collaboration workflow | 1136 - collaboration workflow |
| 1137 | 1137 |
| 1138 Parler du happy path d'abord --> | 1138 Parler du happy path d'abord --> |
| 1139 | 1139 |
| 1140 <!-- ## Content to integrate (presentation old content) | 1140 <!-- ## Content to integrate (presentation old content) |
| 2023 <td>`hg fold`<br></td> | 2023 <td>`hg fold`<br></td> |
| 2024 </tr> | 2024 </tr> |
| 2025 </table> | 2025 </table> |
| 2026 | 2026 |
| 2027 | 2027 |
| 2028 ## Troubles | 2028 ## Instability |
| 2029 | 2029 |
| 2030 #### Evolution | 2030 #### Evolution |
| 2031 | 2031 |
| 2032 * Unlock powerful unique features | 2032 * Unlock powerful unique features |
| 2033 | 2033 |
| 2039 | 2039 |
| 2040 - Automated resolution `hg help evolve` | 2040 - Automated resolution `hg help evolve` |
| 2041 | 2041 |
| 2042 #### instability | 2042 #### instability |
| 2043 | 2043 |
| 2044 (currently: *troubles*) | 2044 (currently: *instability*) |
| 2045 | 2045 |
| 2046 * **Orphans:** ancestors were rewritten | 2046 * **Orphans:** ancestors were rewritten |
| 2047 | 2047 |
| 2048 * **Divergence:** branching in evolutions | 2048 * **Divergence:** branching in evolutions |
| 2049 | 2049 |
| 2089 | 2089 |
| 2090 #### Safety first! | 2090 #### Safety first! |
| 2091 | 2091 |
| 2092 <img src="https://media.giphy.com/media/46vrhWWOJ4wHC/giphy.gif"> | 2092 <img src="https://media.giphy.com/media/46vrhWWOJ4wHC/giphy.gif"> |
| 2093 | 2093 |
| 2094 ## extra - Troubles | 2094 ## extra - Instability |
| 2095 | 2095 |
| 2096 #### Obsolete | 2096 #### Obsolete |
| 2097 | 2097 |
| 2098 ~~~graphviz | 2098 ~~~graphviz |
| 2099 digraph G { | 2099 digraph G { |