--- a/hgext/evolve.py Tue Aug 21 04:36:25 2012 +0200
+++ b/hgext/evolve.py Tue Aug 21 12:47:50 2012 +0200
@@ -569,11 +569,13 @@
try:
wlock = repo.wlock()
try:
+ if old.phase() == phases.public:
+ raise util.Abort(_("can not rewrite immutable changeset %s")
+ % old)
+ if not repo.revs('%d and (::.)', old):
+ raise error.Abort(_('cannot amend non ancestor changeset'))
tr = repo.transaction('amend')
try:
- if old.phase() == phases.public:
- raise util.Abort(_("can not rewrite immutable changeset %s")
- % old)
oldphase = old.phase()
# commit current changes as update
# code copied from commands.commit to avoid noisy messages