hg fixup#

add working directory changes to an arbitrary revision#

hg fixup [OPTION]... [-r] REV

Aliases: fix-up

This command is provided by the evolve extension.

A new changeset will be created, superseding the one specified. The new changeset will combine working directory changes with the changes in the target revision.

This operation requires the working directory changes to be relocated onto the target revision, which might result in merge conflicts.

If fixup is interrupted to manually resolve a conflict, it can be continued with --continue/-c, or aborted with --abort.

Note that this command is fairly new and its behavior is still experimental. For example, the working copy will be left on a temporary, obsolete commit containing the fixed-up changes after the operation. This might change in the future.

Returns 0 on success, 1 if nothing changed.

Options

-r

--rev REV

revision to amend

-c

--continue

continue an interrupted fixup

--abort

abort an interrupted fixup

--mq

operate on patch repository