evolve: switch the official name for "kill" to prune stable
authorPierre-Yves.David@ens-lyon.org
Sun, 15 Jul 2012 13:07:54 +0200
branchstable
changeset 365 9f6a77ec66cb
parent 364 616305c63510
child 366 c67af39d1ae9
evolve: switch the official name for "kill" to prune doc have been updated too
docs/evolve-faq.rst
docs/instability.rst
docs/tutorials/tutorial.t
hgext/evolve.py
--- 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``
--- a/docs/instability.rst	Sun Jul 15 12:57:22 2012 +0200
+++ b/docs/instability.rst	Sun Jul 15 13:07:54 2012 +0200
@@ -208,7 +208,7 @@
 
 * Help to automatically solve instability.
 
-* "kill" changeset remotely.
+* "prune" changeset remotely.
 
 * track resulting changeset when submitting patch//pull request.
 
--- a/docs/tutorials/tutorial.t	Sun Jul 15 12:57:22 2012 +0200
+++ b/docs/tutorials/tutorial.t	Sun Jul 15 13:07:54 2012 +0200
@@ -284,7 +284,7 @@
 I have a new commit but I realize that don't want it. (transport shop list does
 not fit well in my standard shopping list)
 
-  $ hg kill . # . is for working directory parent
+  $ hg prune . # . is for working directory parent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at 387187ad9bd9
 
@@ -672,7 +672,7 @@
   $ hg up 437efbcaf700
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-Relocating unstable change after kill
+Relocating unstable change after prune
 ----------------------------------------------
 
 The remote guy keep working
@@ -709,9 +709,9 @@
   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   
 
-In the mean time I noticed you can't buy animals in a super market and I kill the animal changeset:
+In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
 
-  $ hg kill 437efbcaf700
+  $ hg prune 437efbcaf700
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at ffa278c50818
   1 new unstables changesets
@@ -741,7 +741,7 @@
   $ hg log -r 'unstable()'
   ae45c0c3092a (draft): SPAM SPAM SPAM
 
-# XXX make kill stabilization works
+# XXX make prune stabilization works
 #  $ hg stabilize --any
 #  merging shopping
 
--- a/hgext/evolve.py	Sun Jul 15 12:57:22 2012 +0200
+++ b/hgext/evolve.py	Sun Jul 15 13:07:54 2012 +0200
@@ -338,7 +338,7 @@
         ui.warn(_('Multiple non-obsolete children, explicitly update to one\n'))
         return 1
 
-@command('^kill|obsolete|prune',
+@command('^prune|obsolete|kill',
     [('n', 'new', [], _("successor changeset"))],
     _('[OPTION] REV...'))
 def kill(ui, repo, *revs, **opts):