comparison mercurial/commands.py @ 18163:c5bd753c5bc6

amend: allow amend of non-head when obsolete is enabled

Obsolescence marker can represent this situation just fine. The old
version is marked as precursor of the new changeset. All its
descendants become "unstable".

If obsolescence is not enabled we keep the current behavior of
aborting. This new behavior only applies when obsolete is
enabled and is subject to future discussion and changes.

18162:df1b37c8ae67

            raise util.Abort(_('cannot amend public changesets'))
        if len(old.parents()) > 1:
            raise util.Abort(_('cannot amend merge changesets'))
        if len(repo[None].parents()) > 1:
            raise util.Abort(_('cannot amend while merging'))
        if old.children():
            raise util.Abort(_('cannot amend changeset with children'))

        e = cmdutil.commiteditor
        if opts.get('force_editor'):
            e = cmdutil.commitforceeditor

18163:c5bd753c5bc6

            raise util.Abort(_('cannot amend public changesets'))
        if len(old.parents()) > 1:
            raise util.Abort(_('cannot amend merge changesets'))
        if len(repo[None].parents()) > 1:
            raise util.Abort(_('cannot amend while merging'))
        if (not obsolete._enabled) and old.children():
            raise util.Abort(_('cannot amend changeset with children'))

        e = cmdutil.commiteditor
        if opts.get('force_editor'):
            e = cmdutil.commitforceeditor