Mercurial > evolve
comparison docs/evolve-faq.rst @ 781:bc379b9ff48a stable
doc: try to clarify rebase warning
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 22 Jan 2014 14:14:06 -0800 |
| parents | 020619c850bb |
| children | e3cf8d04466c |
comparison
equal
deleted
inserted
replaced
| 780:020619c850bb | 781:bc379b9ff48a |
|---|---|
| 135 Move multiple changesets: ``rebase`` | 135 Move multiple changesets: ``rebase`` |
| 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 obsolete changesets will result in | 140 .. warning:: Beware that rebasing changesets already obsolete will likely result in |
| 141 conflicting versions of the changesets. | 141 divergent versions of the changesets. |
| 142 | 142 |
| 143 Resolve history troubles: ``evolve`` | 143 Resolve history troubles: ``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 |