1. Pierre-Yves David
  2. mutable-history

Commits

Patrick Mézard  committed 299af91

evolve: tweak and add EOL to kill warning

  • Participants
  • Parent commits 598ff1d
  • Branches stable

Comments (0)

Files changed (2)

File hgext/evolve.py

View file
  • Ignore whitespace
             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)

File tests/test-evolve.t

View file
  • Ignore whitespace
   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