changeset 18163 | c5bd753c5bc6 |
parent 18143 | 242d2f4ec01c |
child 18181 | c7d258cd77e5 |
--- a/mercurial/commands.py Fri Dec 21 22:58:59 2012 +0100 +++ b/mercurial/commands.py Mon Dec 31 17:44:18 2012 -0600 @@ -1296,7 +1296,7 @@ raise util.Abort(_('cannot amend merge changesets')) if len(repo[None].parents()) > 1: raise util.Abort(_('cannot amend while merging')) - if old.children(): + if (not obsolete._enabled) and old.children(): raise util.Abort(_('cannot amend changeset with children')) e = cmdutil.commiteditor