mercurial/cmdutil.py

16629:1435866c1937

        #          |
        # old      o - changeset to amend
        #          |
        # base     o - parent of amending changeset

        files = set(old.files())

        # Second, we use either the commit we just did, or if there were no
        # changes the parent of the working directory as the version of the
        # files in the final amend commit

            ui.note(_('copying changeset %s to %s\n') % (ctx, base))

            user = ctx.user()
            date = ctx.date()
            message = ctx.description()
            extra = ctx.extra()
            # Recompute copies (avoid recording a -> b -> a)
            copied = copies.pathcopies(base, ctx)

            # Prune files which were reverted by the updates: if old introduced
            # file X and our intermediate commit, node, renamed that file, then

16642:5cf18921bb7b

        #          |
        # old      o - changeset to amend
        #          |
        # base     o - parent of amending changeset

        # Update extra dict from amended commit (e.g. to preserve graft source)
        extra.update(old.extra())

        # Also update it from the intermediate commit or from the wctx
        extra.update(ctx.extra())

        files = set(old.files())

        # Second, we use either the commit we just did, or if there were no
        # changes the parent of the working directory as the version of the
        # files in the final amend commit

            ui.note(_('copying changeset %s to %s\n') % (ctx, base))

            user = ctx.user()
            date = ctx.date()
            message = ctx.description()
            # Recompute copies (avoid recording a -> b -> a)
            copied = copies.pathcopies(base, ctx)

            # Prune files which were reverted by the updates: if old introduced
            # file X and our intermediate commit, node, renamed that file, then