Mercurial > public > mercurial-scm > evolve
diff docs/tutorial/test-training.t @ 4618:803d32f4e498
docs: change `unstable` references to `orphan`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 27 Apr 2019 21:24:18 -0400 |
parents | a78310b900e3 |
children |
line wrap: on
line diff
--- a/docs/tutorial/test-training.t Sat Apr 27 21:09:47 2019 -0400 +++ b/docs/tutorial/test-training.t Sat Apr 27 21:24:18 2019 -0400 @@ -2455,7 +2455,7 @@ $ html_output $TESTDIR/output/edit-mid-stack-after-stack.log stack ### target: build/linuxsupport-v2 (branch) - <span style="color:olive;">b3</span><span style="color:red;">$</span> Third commit on build/linuxsupport-v2<span style="color:red;"> (unstable)</span> + <span style="color:olive;">b3</span><span style="color:red;">$</span> Third commit on build/linuxsupport-v2<span style="color:red;"> (orphan)</span> <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 b0^ New commit on build/v2 (base) @@ -2579,7 +2579,7 @@ $ html_output $TESTDIR/output/basic-stabilize-before-evolve-list.log evolve --list 3d2c8a2356a2: Third commit on build/linuxsupport-v2 - unstable: 4686378320d7 (obsolete parent) + orphan: 4686378320d7 (obsolete parent) $ html_output $TESTDIR/output/basic-stabilize-next-evolve.log next --evolve move:[<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2