dvcs

I recently had to make a couple of changes which required rebuilding the repository using hg convert . Unfortunately, this means the bitbucket repo is now inconsistent with the copy I have locally. I don't want to just "blow away" the repo as it exists on bitbucket, because that gets rid of all the other customizations / issue tracking etc. that are associated with the project there. Is it possible to completely wipe the repository from Bitbucket's view of things and push everything from my local (fixed) repo there? You can strip the changesets from the Bitbucket repository. Go to https:/

I have just begun working on a project which uses Mercurial as a version control system, and I need some basic tips on how to use this. Please use this question to give some introductory tips on this technology. The official Mercurial site Especially, I am looking for tips on the best programs to use and the best techniques to use (branches, in and out-checking etc. I need to learn the best-practices!) Steven Lyons I know you already have the Mercurial site but the resource most useful to me was the Mercurial book . It's an excellent overview of the program and how to use it. I found the best

During merges mercurial leaves .orig file for any unresolved file. But after manually resolving problems and marking a file correct it does not delete the .orig file. Can it be automatically removed by some command? I work on a Mac so I can use something like: find . -iname '*.orig' -exec rm '{}' ';' and alias it or something, but I'd rather use something like hg cleanup... UPDATE: Since some time now, Purge extension is bundled with Mercurial and solves this problem nicely. Martin Geisler Personally, I use $ rm **/*.orig if I get tired of the .orig files. This works in Zsh and in Bash 4 after

I have a couple of projects with different release cycles sitting in my SVN repository. Releases are created by using the classic tags structure in SVN. When there are bugs to fix in releases a branch is created from a tag, the bug is fixed and then merged from there into trunk. Now, for multiple reasons, I want to switch from SVN to mercurial with a central push site. Question: Which is the best way in mercurial to organize multiple projects that share little code between them? Should I create multiple push sites, one for each project? Please include in the answer a description on how to

When I have two branches in Hg repo, how to merge only one file with another branch, without having all other files from changeset merged? Is it possible to merge only certain files, instead of whole changeset? WARNING: such 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 if you merge into the other branch, the changes on that other branch will be undone. If all you want

This is a cousin question with my earlier question of "How to manage concurrent development with mercurial", which covers individual developer workflow. The answer to this question will actually influence the choice for developer workflow. This is NOT a general "release management best practice" or CI question, as it has been asked many times with good answers, and there's a huge body of literature available to kill time. I'm only asking for specific ways to use mercurial within the context of release management . The most obvious and predominant answer would supposedly be stable/default ,