hg graft allows “cherry-picking,” as you noted in your question. For example, you can run hg graft -D “2085::2093 and not 2091” to copy only some changes from another revision. By comparison, hg rebase (with or without –keep) will grab whatever changeset you specify and all of its decendant changes. Also, rebase allows you to … Read more
Use the shell alias style like this: giveup = !$HG revert –all –no-backup ; $HG purge Though, personally I’d just create a bash alias for those so I could skip the hg part altogether.
A Mercurial repository gets its identity when you make the first commit in it. When you create a new repository on Bitbucket, you create an empty repository with no identity. When you clone this repository to machine A and make a commit and push it back, then you brand the repository. If you have cloned … Read more
With the patch applied: hg qrefresh -X [file1] -X [file2] … -X [fileN] Will take out file1 to fileN of the patch. After completing that, type hg status to verify that the files are now marked as modified, and therefore not part of the patch any longer .
Starting with Mercurial 2.1 (released in February 2012), you can mark your changesets secret to keep them from being pushed to another repository. You use the new hg phase command to do this: $ hg phase –force –secret . This mark the current working directory parent revision (.) as being in the secret phase. Secret … Read more
Try hg status and look for files in state ! (missing). The cause is that one of the files which is part of the merge has been deleted. Undelete the file and try again.
There are two ways to split a changeset, depending on whether or not you’ve already committed the changes that you wish to split: To selectively commit changes from your working directory (if you haven’t committed your changes yet): Use hg record. (This is similar to using git commit –patch.) To split an existing changeset (if … Read more
You can use hg log with a –template option, e.g.: hg log –template ‘{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n’ This should show something like this (example from the GNU Emacs trunk I converted locally to an hg repository): $ hg log –limit 5 –template ‘{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n’ 36ab2e3f8ebd | 2010-09-08 16:54:00 +0200 … Read more
There is no pure Mercurial solution, but you can do something like: hg log –template “{author|person}\n” | sort | uniq -c | sort -nr If you want to be able to type hg shortlog, you can add the following to your .hgrc or mercurial.ini: [alias] shortlog = !hg log –template “{author|person}\n” | sort | uniq … Read more
You can use hg mv –after to signify you have already moved the file.