Mercurial > evolve
changeset 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 |
| files | docs/evolve-faq.rst |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/evolve-faq.rst Wed Jan 22 14:13:22 2014 -0800 +++ b/docs/evolve-faq.rst Wed Jan 22 14:14:06 2014 -0800 @@ -137,8 +137,8 @@ You can still use rebase to move a whole segment of the changeset graph together. -.. warning:: Beware that rebasing obsolete changesets will result in - conflicting versions of the changesets. +.. warning:: Beware that rebasing changesets already obsolete will likely result in + divergent versions of the changesets. Resolve history troubles: ``evolve`` ------------------------------------------------------------