diff -r 020619c850bb -r bc379b9ff48a docs/evolve-faq.rst --- 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`` ------------------------------------------------------------