diff -r ac7969043677 -r 5bc3e5dc2637 docs/evolve-faq.rst --- a/docs/evolve-faq.rst Fri Jul 13 13:07:42 2012 +0200 +++ b/docs/evolve-faq.rst Sun Jul 15 14:51:52 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 ``. +Just use ``hg prune ``. Moving within the history: ``up`` ``gdown`` and ``gup`` ------------------------------------------------------------ @@ -114,8 +114,8 @@ To split on file boundaries, just use ``uncommit`` command. -There is no official command yet to split at a finer granularity. One -way to achieve this is:: +If you need fine-grained split, there is no official command for that yet. +However, it is easily achieved by manual operation:: ### you want to split changeset A: 42 # update to A parent @@ -128,7 +128,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 @@ -175,19 +175,19 @@ 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 `` to add obsolete +you can use ``hg prune --new `` to add obsolete marker. Export to mq: ``synchronize`` ------------------------------------------------------------ -Another extension lets you export your changes to mq. +Another extension allows to export your changes to mq. View diff from the last amend ------------------------------------------------------------