I m looking for a counter-part of git commit --amend in Mercurial i e a way to modify the commit which my working copy is linked to I m only interested in the last commit not an arbitrary earlier commit The requirements for this amend-procedure are if possible it should not require any extensions It must not require non-default extensions i e extensions which do not come with an official Mercurial installation if the commit to amend is one head of my current branch no new head should be created If the commit is not head a new head may be created the procedure should be safe in a way that if for whatever reasons the amending fails I want to have the same working copy and repository state restored as before the amending With other words if the amending itself can fail there should be a fail-safe procedure to restore the working copy and repository state I m referring to failures which lie in the nature of the amend-procedure like e g conflicts not to file-system-related problems like access restrictions not being able to lock a file for writing Update 1 the procedure must be automatable so it can be performed by a GUI client without any user interaction required Update 2 files in the working directory must not be touched there may be file system locks on certain modified files This especially means that a possible approach may at no point require a clean working directory

You have 3 options to edit commits in Mercurial hg strip --keep --rev -1 undo the last 1 commit s so you can do it again see this answer for more information Using the MQ extension which is shipped with Mercurial Even if it isn t shipped with Mercurial the Histedit extension is worth mentioning You can also have a look on the Editing History page of the Mercurial wiki In short editing history is really hard and discouraged And if you ve already pushed your changes there s barely nothing you can do except if you have total control of all the other clones I m not really familiar with the git commit --amend command but AFAIK Histedit is what seems to be the closest approach but sadly it isn t shipped with Mercurial MQ is really complicated to use but you can do nearly anything with it

Recent versions of Mercurial include the evolve extension which provides the hg amend command This allows amending a commit without losing the pre-amend history in your version control hg amend OPTION FILE aliases refresh combine a changeset with updates and replace it with a new one Commits a new changeset incorporating both the changes to the given files and all the changes from the current parent changeset into the repository See hg commit for details about committing changes If you don t specify -m the parent s message will be reused Behind the scenes Mercurial first commits the update as a regular child of the current parent Then it creates a new commit on the parent s parents with the updated contents Then it changes the working copy parent to this new combined changeset Finally the old changeset and its update are hidden from hg log unless you use --hidden with log See https www mercurial-scm org doc evolution user-guide html example-3-amend-a-changeset-with-evolve for a complete description of the evolve extension

I m tuning into what krtek has written More specifically solution 1 Assumptions you ve committed one changeset but have not pushed it yet you want to modify this changeset e g add remove or change files and or the commit message Solution use hg rollback to undo the last commit commit again with the new changes in place The rollback really undoes the last operation Its way of working is quite simple normal operations in HG will only append to files this includes a commit Mercurial keeps track of the file lengths of the last transaction and can therefore completely undo one step by truncating the files back to their old lengths

Assuming that you have not yet propagated your changes here is what you can do Add to your hgrc extensions mq In your repository hg qimport -r0 tip hg qpop -a Of course you need not start with revision zero or pop all patches for the last just one pop hg qpop suffices see below remove the last entry in the hg patches series file or the patches you do not like Reordering is possible too hg qpush -a hg qfinish -a remove the diff files unapplied patches still in hg patches should be one in your case If you don t want to take back all of your patch you can edit it by using hg qimport -r0 tip or similar then edit stuff and use hg qrefresh to merge the changes into the topmost patch on your stack Read hg help qrefresh By editing hg patches series you can even remove several patches or reorder some If your last revision is 99 you may just use hg qimport -r98 tip hg qpop edit series file hg qpush -a hg qfinish -a Of course this procedure is highly discouraged and risky Make a backup of everything before you do this As a sidenote I ve done it zillions of times on private-only repositories

With the release of Mercurial 2 2 you can use the --amend option with hg commit to update the last commit with the current working directory From the command line reference The --amend flag can be used to amend the parent of the working directory with a new commit that contains the changes in the parent in addition to those currently reported by hg status if there are any The old commit is stored in a backup bundle in hg strip-backup see hg help bundle and hg help unbundle on how to restore it Message user and date are taken from the amended commit unless specified When a message isn t specified on the command line the editor will open with the message of the amended commit The great thing is that this mechanism is quot safe quot because it relies on the relatively new quot Phases quot feature to prevent updates that would change history that s already been made available outside of the local repository

GUI equivalent for hg commit --amend This also works from TortoiseHG s GUI I m using v2 5 Swich to the Commit view or in the workbench view select the working directory entry The Commit button has an option named Amend current revision click the button s drop-down arrow to find it Caveat emptor This extra option will only be enabled if the mercurial version is at least 2 2 0 and if the current revision is not public is not a patch and has no children Clicking the button will call commit --amend to amend the revision More info about this on the THG dev channel

Might not solve all the problems in the original question but since this seems to be the de facto post on how mercurial can amend to previous commit I ll add my 2 cents worth of information If you are like me and only wish to modify the previous commit message fix a typo etc without adding any files this will work hg commit -X glob --amend Without any include or exclude patterns hg commit will by default include all files in working directory Applying pattern -X glob will exclude all possible files allowing only to modify the commit message Functionally it is same as git commit --amend when there are no files in index stage

[mercurial] Mercurial: how to amend the last commit?

Another solution could be use the uncommit command to exclude specific file from current commit.

hg uncommit [file/directory]

This is very helpful when you want to keep current commit and deselect some files from commit (especially helpful for files/directories have been deleted).

Examples related to mercurial

• Convert Mercurial project to Git • Mercurial: how to amend the last commit? • Discard all and get clean copy of latest revision? • Mercurial undo last commit • How to save username and password with Mercurial? • Mercurial — revert back to old version and continue from there • Is there any way to delete local commits in Mercurial? • How to correctly close a feature branch in Mercurial? • How can I switch to a tag/branch in hg? • What is the difference between hg forget and hg remove?

Examples related to commit

• git: updates were rejected because the remote contains work that you do not have locally • How to add multiple files to Git at the same time • Why Git is not allowing me to commit even after configuration? • Git commit in terminal opens VIM, but can't get back to terminal • How to configure Git post commit hook • GIT commit as different user without email / or only email • Editing the git commit message in GitHub • How to amend a commit without changing commit message (reusing the previous one)? • Temporarily switch working copy to a specific Git commit • git - Your branch is ahead of 'origin/master' by 1 commit

Examples related to git-amend

• How to amend a commit without changing commit message (reusing the previous one)? • Mercurial: how to amend the last commit? • How to undo "git commit --amend" done instead of "git commit" • How do I push amended commit to the remote Git repository? • How to modify existing, unpushed commit messages?

Examples related to mercurial-commit

• Mercurial: how to amend the last commit? • Mercurial undo last commit • How to edit incorrect commit message in Mercurial?