Mercurial > evolve
comparison docs/evolve-faq.rst @ 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 | a05bfdf372fb |
comparison
equal
deleted
inserted
replaced
| 4617:2cab06f5c4d4 | 4618:803d32f4e498 |
|---|---|
| 142 | 142 |
| 143 Resolve history instability: ``evolve`` | 143 Resolve history instability: ``evolve`` |
| 144 --------------------------------------- | 144 --------------------------------------- |
| 145 | 145 |
| 146 When you rewrite (amend) a changeset with children without rewriting | 146 When you rewrite (amend) a changeset with children without rewriting |
| 147 those children you create *unstable* changesets and *suspended | 147 those children you create *orphan* changesets and *suspended |
| 148 obsolete* changesets. | 148 obsolete* changesets. |
| 149 | 149 |
| 150 When you are finished amending a given changeset, you will want to | 150 When you are finished amending a given changeset, you will want to |
| 151 declare it stable, in other words rebase its former descendants on its | 151 declare it stable, in other words rebase its former descendants on its |
| 152 newest version. | 152 newest version. |