To see workspace status relative to the current directory you can always use “.” (a single dot) as the argument of “hg status”, i.e.: % hg root # root of the workspace /work/foo % pwd # current directory is <root>/src /work/foo/src % hg status # no argument, see all files M etc/foo.conf # all files … Read more
Have a look at bitbucket. Mercurial hosting as well as issue tracker and wiki. If you don’t need to host the stuff on your own server it might fit your requirements.
First, I highly recommend A Guide to Branching in Mercurial Next, you could push just the current branch: Nudge – A Gentler Version of Push And maybe you could decide to allow only a head per branch: 32. Prevent a push that would create multiple heads Other SO questions related to named branches: Mercurial: Named … Read more
You can just pull the changesets into one big repository. Start with the A repo: $ hg init combined $ cd combined $ hg pull ../A $ hg update Then forcibly pull in B and dummy-merge the two heads so that you keep the files from B: $ hg pull ../B –force $ hg merge … Read more
You no longer have to mess with the .ini file. As long as you have both TortoiseHG and WinMerge installed you will see it as an option in TortoiseHG Global Settings – TortoiseHG section – Three-way Merge Tool and Visual Diff Tool. It shows up as “winmergeu”. Banged my head against the wall for a … Read more
Local is r133 Other is r134 Base is r128 (the common ancestor to both r133 and r 134) When you perform a 3 way merge it compares all three of those together to help you decide what to take and from where. By seeing what change is in the other revision and what the common … Read more
The mercurial API allows it: from mercurial import ui, hg, node peer = hg.peer(ui.ui(), {}, ‘http://hg.python.org/cpython’) for name, rev in peer.branchmap().items(): print(name, node.short(rev[0])) The above snippet produces: default aaa68dce117e legacy-trunk b77918288f7d 3.2 4787b9b2f860 3.0 4cd9f5e89061 3.1 5a6fa1b8767f 2.3 364638d6434d 2.2 61b0263d6881 2.1 e849d484029f 2.0 5fd74354d73b 2.7 260f3ad7af4b 2.6 f130ce67387d 2.5 b48e1b48e670 2.4 ceec209b26d4
You want hg backout Revert/undo the effect of an earlier changeset… Backout works by applying a changeset that’s the opposite of the changeset to be backed out. That new changeset is committed to the repository, and eventually merged…
There is a filesystem help topic being worked on that will be included in the next version of Mercurial: https://www.mercurial-scm.org/pipermail/mercurial-devel/2012-April/039522.html Renaming colliding files On case-insensitive filesystems, updating to revisions which have files with case collisions will abort, even with –check or –clean. To repair such revisions, you should give new names to one or both … Read more
Yes, you can select a revision to push. hg push -r 3001 (all ancestors of the chosen revision will be pushed; you don’t need to specify 3000.)