--- a/docs/evolve-faq.rst Sun Jul 15 12:57:22 2012 +0200
+++ b/docs/evolve-faq.rst Sun Jul 15 13:07:54 2012 +0200
@@ -68,12 +68,12 @@
abusive. But this was very convenient for experimental purposes.
This will likely change in non experimental release.
-Delete a changeset: ``kill``
+Delete a changeset: ``prune``
------------------------------------------------------------
-A new ``kill`` command allows removing a changeset.
+A new ``prune`` command allows removing a changeset.
-Just use ``hg kill <some-rev>``.
+Just use ``hg prune <some-rev>``.
Moving within the history: ``up`` ``gdown`` and ``gup``
------------------------------------------------------------
@@ -129,7 +129,7 @@
$ hg commit
# informs mercurial of what appened
# current changeset (.) and previous one (.^) replace A (42)
- $ hg kill --new . --new .^ 42
+ $ hg prune --new . --new .^ 42
Update my current work in progess after a pull
@@ -176,13 +176,13 @@
XXX details issue here
-Fix my history afterward: ``kill -n``
+Fix my history afterward: ``prune -n``
------------------------------------------------------------
Sometimes you need to create an obsolete marker by hand. This may happen when
upstream has applied some of your patches for example.
-you can use ``hg kill --new <new-changeset> <old-changeset>`` to add obsolete
+you can use ``hg prune --new <new-changeset> <old-changeset>`` to add obsolete
marker.
Export to mq: ``synchronize``