Anonymous avatar Anonymous committed 9f6a77e

evolve: switch the official name for "kill" to prune

doc have been updated too

Comments (0)

Files changed (4)

docs/evolve-faq.rst

        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``
 ------------------------------------------------------------
   $ 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
              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``

docs/instability.rst

 
 * Help to automatically solve instability.
 
-* "kill" changeset remotely.
+* "prune" changeset remotely.
 
 * track resulting changeset when submitting patch//pull request.
 

docs/tutorials/tutorial.t

 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
 
   $ 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
   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
   $ hg log -r 'unstable()'
   ae45c0c3092a (draft): SPAM SPAM SPAM
 
-# XXX make kill stabilization works
+# XXX make prune stabilization works
 #  $ hg stabilize --any
 #  merging shopping
 
         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):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.