Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncommit: change 'kill' to 'prune' in error message stable
authorFaheem Mitha <faheem@faheem.info>
Sat, 03 May 2014 03:46:21 +0530
branchstable
changeset 925 89b50258ad33
parent 924 a6a202c22b28
child 926 14d91c36f88b
uncommit: change 'kill' to 'prune' in error message 'kill' was renamed to 'prune' Long time ago.
hgext/evolve.py file | annotate | diff | comparison | revisions
tests/test-uncommit.t file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Tue Apr 29 16:31:21 2014 -0700
+++ b/hgext/evolve.py	Sat May 03 03:46:21 2014 +0530
@@ -1641,7 +1641,7 @@
             updatebookmarks(newid)
             if not repo[newid].files():
                 ui.warn(_("new changeset is empty\n"))
-                ui.status(_('(use "hg kill ." to remove it)\n'))
+                ui.status(_('(use "hg prune ." to remove it)\n'))
         finally:
             wlock.release()
     finally:
--- a/tests/test-uncommit.t	Tue Apr 29 16:31:21 2014 -0700
+++ b/tests/test-uncommit.t	Sat May 03 03:46:21 2014 +0530
@@ -316,7 +316,7 @@
 
   $ hg uncommit e
   new changeset is empty
-  (use "hg kill ." to remove it)
+  (use "hg prune ." to remove it)
   $ hg debugobsolete
   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob)
   5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 {'date': '* *', 'user': 'test'} (glob)
evolve