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 can make an auth section in your .hgrc or Mercurial.ini file, like so: [auth] bb.prefix = https://bitbucket.org/repo/path bb.username = foo bb.password = foo_passwd The ‘bb’ part is an arbitrary identifier and is used to match prefix with username and password – handy for managing different username/password combos with different sites (prefix) You can also … Read more
‘hg forget‘ is just shorthand for ‘hg remove -Af‘. From the ‘hg remove‘ help: …and -Af can be used to remove files from the next revision without deleting them from the working directory. Bottom line: ‘remove‘ deletes the file from your working copy on disk (unless you uses -Af) and ‘forget‘ doesn’t.
This is not a PowerShell deficiency. It is a deficiency with the Windows console subsystem which PowerShell.exe uses. The console subsystem does not support Unicode but code pages instead which dates back to the DOS days. The PowerShell V2 fix is provided via the PowerShell Integrated Scripting Environment or PowerShell_ISE.exe. This is a graphical app … Read more
Just a quick comment to remind you that: those migrations often offer the opportunity to reorganize the sources, not along modules (each with one repositories) but rather along a functional domain split (several modules for a same given functional domain being put in the same repository). Then submodules are to be used, as a way … Read more
I’d advise against it for the reasons stated above, but more strenuously stated. Both mercurial and git have their own protocols for moving changesets between repositories. These protocols are optimized/built for: efficiency consistency (never can you pull from a repo in a half-updated state) hooks/triggers — doing things on push/pull including quality (no tabs allowed, … Read more
WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
If you’ve not published your repository then this shouldn’t be too hard. You need to use the Convert extension to Mercurial, which will let you ‘filter’ your existing repository to create a new one. the –authors switch lets you edit the author for each commit as it is filtered. If you have published your repository, … Read more
Starting with Git 1.7.0, there is a special syntax that allows you to generically refer to the upstream branch: @{u} or @{upstream}. To mimic hg incoming: git log ..@{u} To mimic hg outgoing: git log @{u}.. I use the following incoming and outgoing aliases to make the above easier to use: git config –global alias.incoming … Read more
VonC has the answer you’re looking for, the Rebase Extension. It is, however, worth spending a second or two thinking about why neither mq nor rebase are enabled by default in mercurial: because mercurial is all about indelible changesets. When I work in the manner you’re describing, which is nearly daily, here’s the pattern I … Read more