# HG changeset patch # User Patrick Mezard # Date 1344008901 -7200 # Node ID 299af91b8b6ea4c2ba9e34e8d2bd3ee16928b941 # Parent 598ff1df3b928bc0fd7e259ffd00f30cac4a44f5 evolve: tweak and add EOL to kill warning diff -r 598ff1df3b92 -r 299af91b8b6e hgext/evolve.py --- a/hgext/evolve.py Mon Jul 30 22:45:06 2012 +0200 +++ b/hgext/evolve.py Fri Aug 03 17:48:21 2012 +0200 @@ -359,7 +359,7 @@ new = [node.nullid] for n in targetnodes: if not repo[n].mutable(): - ui.warn(_("Can't kill immutable changeset %s") % repo[n]) + ui.warn(_("cannot kill immutable changeset %s\n") % repo[n]) else: for ne in new: repo.addobsolete(ne, n) diff -r 598ff1df3b92 -r 299af91b8b6e tests/test-evolve.t --- a/tests/test-evolve.t Mon Jul 30 22:45:06 2012 +0200 +++ b/tests/test-evolve.t Fri Aug 03 17:48:21 2012 +0200 @@ -54,6 +54,15 @@ 1 - 7c3bad9141dc add b (public) 0 - 1f0dee641bb7 add a (public) +test kill and immutable changeset + + $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' + 1 public stable + $ hg kill 1 + cannot kill immutable changeset 7c3bad9141dc + $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' + 1 public stable + test simple kill $ hg id -n