--- a/docs/evolve-faq.rst Fri Aug 24 10:44:23 2012 +0200
+++ b/docs/evolve-faq.rst Fri Aug 24 11:17:18 2012 +0200
@@ -152,7 +152,7 @@
.. warning:: Beware that rebasing obsolete changesets will result in
conflicting versions of the changesets.
-Stabilize history: ``stabilize``
+Stabilize history: ``evolve``
------------------------------------------------------------
When you rewrite (amend) a changeset with children without rewriting
@@ -164,16 +164,6 @@
newest version. This is not done automatically to avoid the
proliferation of useless hidden changesets.
-.. warning:: ``hg stabilize`` have no --continue to use after conflict
- resolution
-
-.. warning:: stabilization does not handle deletion yet.
-
-.. warning:: obsolete currently relies on changesets in secret phase
- to avoid exchanging obsolete and unstable changesets.
-
- XXX details issue here
-
Fix my history afterward: ``prune -n``
------------------------------------------------------------