# HG changeset patch # User Faheem Mitha # Date 1399068981 -19800 # Node ID 89b50258ad33218b6c536350b18ba795dfd7955c # Parent a6a202c22b2864c3fefd2d8e0e5ff28a847d0cea uncommit: change 'kill' to 'prune' in error message 'kill' was renamed to 'prune' Long time ago. diff --git a/hgext/evolve.py b/hgext/evolve.py --- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -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: diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t --- a/tests/test-uncommit.t +++ b/tests/test-uncommit.t @@ -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)