If you are using TortoiseHg 1.x for Windows, this feature is implemented beautifully right out of the box (no extensions required). Run the TortoiseHg Commit Tool. Choose a file for which you only want to commit a subset of its changes. Click on the Hunk Selection tab in the preview pane. Double-click or use the … Read more
Graft uses Mercurial internal merging, while transplant relies on patch mechanism. Therefore graft should be able to handle three-way-merges better than transplant currently does.
Yes, you can do this using mercurial without any extensions by Concatenating Changesets. Alternately if you want to use an extension you could use: The Collapse Extension The Rebase Extension or The Histedit Extension
Update to the stiging branch and create a new branch off of it. Then close the old branch. In summary: hg update stiging hg branch staging hg commit -m”Changing stiging branch to staging.” hg update stiging hg commit –close-branch -m”This was a typo; use staging instead.” hg push –new-branch
When “waiting for lock on repository”, delete the repository file: .hg/wlock (or it may be in .hg/store/lock) When deleting the lock file, you must make sure nothing else is accessing the repository. (If the lock is a string of zeros or blank, this is almost certainly true).
Here’s what I’d do: Make default your “mainline” branch. The tip of this branch is the “currently released to the public” version of your code. Critical bugfixes can be committed directly to this branch and merged into development branches. To start working on version 2.0, make a 2.0-dev branch. Commit changes for 2.0 to that … Read more
Update your repository to the head with the revision that you want to forget about, then use hg commit –close-branch to mark that (anonymous) branch as closed. Then update to the head of the branch that you do want, and continue working. You can still see the closed branch if you use the -c option … Read more
Enable the “strip” extension and type the following: hg strip #changeset# –keep Where #changeset# is the hash for the changeset you want to remove. This will remove the said changeset including changesets that descend from it and will leave your working directory untouched. If you wish to also revert your committed code changes remove the … Read more
You could use the Timestamp extension, if creating new “reference” timestamps will not be a problem. From its website: It does this by means of a database file .hgtimestamp, residing in the repo’s root and thus being versioned. Other than this, I don’t think it’s possible. I’ve read a little about Timestamp hook, and it … Read more
There is no simple / recommended way of doing this directly to an existing repository. You can however “convert” your mercurial repo to a new mercurial repo and choose a revision from where to include the history onwards via the convert.hg.startrev option hg convert –config convert.hg.startrev=1234 <source-repository> <new-repository-name> The new repo will contain everything from … Read more