Mercurial > evolve
comparison docs/evolve-faq.rst @ 4620:a05bfdf372fb
docs: change `divergent` references to `content-divergent`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 27 Apr 2019 21:41:04 -0400 |
| parents | 803d32f4e498 |
| children | 8784dfc6537c |
comparison
equal
deleted
inserted
replaced
| 4619:93514c421528 | 4620:a05bfdf372fb |
|---|---|
| 136 ------------------------------------ | 136 ------------------------------------ |
| 137 | 137 |
| 138 You can still use rebase to move a whole segment of the changeset graph together. | 138 You can still use rebase to move a whole segment of the changeset graph together. |
| 139 | 139 |
| 140 .. warning:: Beware that rebasing changesets already obsolete will likely result in | 140 .. warning:: Beware that rebasing changesets already obsolete will likely result in |
| 141 divergent versions of the changesets. | 141 content-divergent versions of the changesets. |
| 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 |
| 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. |
| 153 | 153 |
| 154 You can also use evolve to solve `bumped` and `divergent` changeset/ | 154 You can also use evolve to solve `bumped` and `content-divergent` changeset/ |
| 155 | 155 |
| 156 | 156 |
| 157 Fix my history afterward: ``prune -n`` | 157 Fix my history afterward: ``prune -n`` |
| 158 -------------------------------------- | 158 -------------------------------------- |
| 159 | 159 |