Mercurial > evolve

Help: fixup

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.

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

aliases: fix-up

add working directory changes to an arbitrary revision

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

global options ([+] can be repeated):

-R --repository REPO repository root directory or name of overlay bundle file
--cwd DIR change working directory
-y --noninteractive do not prompt, automatically pick the first choice for all prompts
-q --quiet suppress output
-v --verbose enable additional output
--color TYPE when to colorize (boolean, always, auto, never, or debug)
--config CONFIG [+] set/override config option (use 'section.name=value')
--debug enable debugging output
--debugger start debugger
--encoding ENCODE set the charset encoding (default: UTF-8)
--encodingmode MODE set the charset encoding mode (default: strict)
--traceback always print a traceback on exception
--time time how long the command takes
--profile print command execution profile
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
--pager TYPE when to paginate (boolean, always, auto, or never) (default: auto)