evolve: comparison docs/tutorial/slides.md

equal deleted inserted replaced

-:2cab06f5c4d4
+:803d32f4e498
 ```raw-file
 output/edit-mid-stack.log
 ```
-The message `1 new orphan changesets` means that, by amending a changeset having a child, this child is now **unstable**, as we can see with the `hg stack` command:
+The message `1 new orphan changesets` means that, by amending a changeset having a child, this child is now **orphan**, as we can see with the `hg stack` command:
 ```raw-file
 output/edit-mid-stack-after-stack.log
 ```
 ```raw-file
 output/basic-stabilize-before-log-obsolete.log
 ```
-A changeset can also be **unstable**, meaning that it could be subject to one or more **instabilities**:
+A changeset can also be **orphan**, meaning that it could be subject to one or more **instabilities**:
 * **orphan**, a changeset whose an ancestor is **obsolete**.
 * **content-divergent**, a changeset which has been rewritten in two different versions.
 * **phase-divergent**, a changeset which has been both rewritten and published.
 <pre>
 $> hg update --rev t1
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $> hg commit --amend -m "Step1"
-<span style="color:gold;">3 new unstable changesets</span>
+<span style="color:gold;">3 new orphan changesets</span>
 </pre>
 #### What have we done?
 <pre>
 $> hg log -G -T compact
 @  <span style="color:olive;">9</span>[tip]     1aa1be5ada40    Step1
 |
-| o  <span style="color:olive;">8</span>        cf90b2de7e65    Step4 <span style="color:red;">(unstable)</span>
+| o  <span style="color:olive;">8</span>        cf90b2de7e65    Step4 <span style="color:red;">(orphan)</span>
 | |
-| o  <span style="color:olive;">7</span>        e208d4205c8e    Step3 <span style="color:red;">(unstable)</span>
+| o  <span style="color:olive;">7</span>        e208d4205c8e    Step3 <span style="color:red;">(orphan)</span>
 | |
-| o  <span style="color:olive;">6</span>        673ff300cf3a    Step2 <span style="color:red;">(unstable)</span>
+| o  <span style="color:olive;">6</span>        673ff300cf3a    Step2 <span style="color:red;">(orphan)</span>
 | |
 | <span style="color:grey;">x  5        8bb88a31dd28    Step</span>
 |/
 o  <span style="color:olive;">4</span>          3294c1730df7    Trunk
 ~
 <pre>
 $> hg stack
 ###### topic: <span style="color:green;">myfeature</span>
 ###### branch: feature
-<span style="color:olive;">t4</span><span style="color:red;">$</span> Step4<span style="color:red;"> (unstable)</span>
+<span style="color:olive;">t4</span><span style="color:red;">$</span> Step4<span style="color:red;"> (orphan)</span>
-<span style="color:olive;">t3</span><span style="color:red;">$</span> Step3<span style="color:red;"> (unstable)</span>
+<span style="color:olive;">t3</span><span style="color:red;">$</span> Step3<span style="color:red;"> (orphan)</span>
-<span style="color:olive;">t2</span><span style="color:red;">$</span> Step2<span style="color:red;"> (unstable)</span>
+<span style="color:olive;">t2</span><span style="color:red;">$</span> Step2<span style="color:red;"> (orphan)</span>
 <span style="color:teal;">t1</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Step1</span><span style="color:teal;font-weight:bold;"> (current)</span>
 <span style="color:grey;">t0^ Trunk</span>
 </pre>
 #### Don't panic
 atop:[<span style="color:blue;">9</span>] Step1
 working directory now at <span style="color:olive;">d72473cbf9a6</span>
 $> hg stack
 ###### topic: <span style="color:green;">myfeature</span>
 ###### branch: feature
-<span style="color:olive;">t4</span><span style="color:red;">$</span> Step4<span style="color:red;"> (unstable)</span>
+<span style="color:olive;">t4</span><span style="color:red;">$</span> Step4<span style="color:red;"> (orphan)</span>
-<span style="color:olive;">t3</span><span style="color:red;">$</span> Step3<span style="color:red;"> (unstable)</span>
+<span style="color:olive;">t3</span><span style="color:red;">$</span> Step3<span style="color:red;"> (orphan)</span>
 <span style="color:teal;">t2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Step2</span><span style="color:teal;font-weight:bold;"> (current)</span>
 <span style="color:olive;">t1</span><span style="color:green;">:</span> Step1
 <span style="color:grey;">t0^ Trunk</span>
 </pre>
 atop:[<span style="color:blue;">10</span>] Step2
 working directory now at <span style="color:olive;">4062d6ecd214</span>
 $> hg stack
 ###### topic: <span style="color:green;">myfeature</span>
 ###### branch: feature
-<span style="color:olive;">t4</span><span style="color:red;">$</span> Step4<span style="color:red;"> (unstable)</span>
+<span style="color:olive;">t4</span><span style="color:red;">$</span> Step4<span style="color:red;"> (orphan)</span>
 <span style="color:teal;">t3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Step3</span><span style="color:teal;font-weight:bold;"> (current)</span>
 <span style="color:olive;">t2</span><span style="color:green;">:</span> Step2
 <span style="color:olive;">t1</span><span style="color:green;">:</span> Step1
 <span style="color:grey;">t0^ Trunk</span>
 </pre>
 #### Summary
 <pre>
 $> hg summary
-<span style="color:olive;">parent: 10:890ac95deb83 </span>tip (unstable)
+<span style="color:olive;">parent: 10:890ac95deb83 </span>tip (orphan)
 Head
 branch: feature
 commit: (clean)
 update: (current)
 phases: 9 draft
-unstable: <span style="color:red;">1 changesets</span>
+orphan: <span style="color:red;">1 changesets</span>
 topic:  <span style="color:green;">myfeature</span>
 </pre>
 #### Topics
 obsmarkerbitfield
 obsrangecacheiterative
 packaging
 prev-next
 split
-stack_unstable_bug
+stack_orphan_bug
 tutorial
 * tutorialtypos
 </pre>
 #### Topics age
 more-output            (3 weeks ago)
 obsmarkerbitfield      (2 months ago)
 obscache               (2 months ago)
 evolvecolor            (2 months ago)
 obsrangecacheiterative (2 months ago)
-stack_unstable_bug     (2 months ago)
+stack_orphan_bug     (2 months ago)
 doc                    (3 months ago)
 split                  (3 months ago)
 import-checker         (4 months ago)
 packaging              (4 months ago)
 </pre>
 obsmarkerbitfield      (on branch: default, 1 changesets, <span style="color:teal;">324 behind</span>)
 obsrangecacheiterative (on branch: default, 1 changesets, <span style="color:teal;">461 behind</span>)
 packaging              (on branch: default, 1 changesets, <span style="color:teal;">2521 behind</span>)
 prev-next              (on branch: default, 4 changesets, <span style="color:teal;">72 behind</span>)
 split                  (on branch: default, 1 changesets, <span style="color:teal;">492 behind</span>)
-stack_unstable_bug     (on branch: default, 1 changesets, <span style="color:teal;">474 behind</span>)
+stack_orphan_bug     (on branch: default, 1 changesets, <span style="color:teal;">474 behind</span>)
 tutorial               (on branch: default, 2 changesets, <span style="color:teal;">492 behind</span>)
 <span style="color:green;"> * </span><span style="color:green;">tutorialtypos         </span> (on branch: default, 3 changesets, <span style="color:red;">1 troubled</span>, <span style="color:olive;">2 heads</span>, <span style="color:teal;">2 behind</span>)
 </pre>
 #### Log
 $ hg log -G --hidden -T '{node|short}\n{obsfate}\n'
 @  c55cb2ee8a91
 |
 o  23abfc79b7ce
 |
-| o  4302274177b9 <span style="color:red;">(unstable)</span>
+| o  4302274177b9 <span style="color:red;">(orphan)</span>
 | |
 | <span style="color:grey;">x  fba593aaaa10</span>
 |/   rewritten as c55cb2ee8a91;
 o  2ff53d8bf7d7
 </pre>
 #### Evolve --list
 <pre>
 $> hg evolve --list
 <span style="color:gold;">9ac0d376e01c</span>: changelog: introduce a 'tiprev' method
-<span style="color:red;">unstable</span>: <span style="color:grey;">52ec3072fe46</span> (obsolete parent)
+<span style="color:red;">orphan</span>: <span style="color:grey;">52ec3072fe46</span> (obsolete parent)
 <span style="color:gold;">3efd3eab9860</span>: changelog: use 'tiprev()' in 'tip()'
-<span style="color:red;">unstable</span>: <span style="color:red;">9ac0d376e01c</span> (unstable parent)
+<span style="color:red;">orphan</span>: <span style="color:red;">9ac0d376e01c</span> (orphan parent)
 </pre>
 (see also `hg evolve --list --rev`)
 #### Obslog
 * Unlock powerful unique features
 * Hide **most** of the complexity
-* Help with unstable situations
+* Help with orphan situations
 - Automatic detection
 - Automated resolution `hg help evolve`
 Obsolete [fillcolor="#DFDFFF"];
 Root[shape="circle"];
 }
 ~~~
-#### Unstable
+#### Orphan
 Now called `orphan`
 ~~~graphviz
 digraph G {
 node[fixedsize=true, style="filled", width=1, height=1, fillcolor="#7F7FFF", shape="pentagon"];
 node[group=main];
 Root -> New;
 node[group=obsolete];
-Root -> Obsolete -> Unstable;
+Root -> Obsolete -> Orphan;
 // Obsolescence links
 edge[dir=back, style=dotted, arrowtail=dot];
 Obsolete -> New;
 Obsolete [fillcolor="#DFDFFF"];
-Unstable [fillcolor="#FF3535"];
+Orphan [fillcolor="#FF3535"];
 Root[shape="circle"];
 }
 ~~~
 #### Bumped

changeset 4618	803d32f4e498
parent 4616	a78310b900e3
child 4619	93514c421528