dvcs

I work on a team where we have a code in a mercurial repository with several subrepositories: main/ main/subrepo1/ main/subrepo1/subrepo2/ The default behavior of Mercurial is that when a hg commit is performed in "main", any outstanding changes in the subrepositories "subrepo1" and "subrepo2" will also be committed. Similarly, when "main" is pushed, any outgoing commits in "subrepo1" and "subrepo2" will also be pushed. We find that people frequently inadvertently commit and push changes in their subrepositories (because they forgot they had made changes, and hg status by default does not show

So I want to get a project on a distributed version control system, such as mercurial, git, or bazaar. The catch is that I need the Windows support to be good, i.e. no instructions that start off with "install cygwin...". Now I've heard that git's Windows support is decent these days, but don't have any first hand experience. Also, it sounds like the bazaar team has an explicit goal of making it as multiplatform as possible. Can I get any recommendations? I use msys-git on windows every single day. Works fast and flawlessly. Although the newer build has some problems with git-svn, this build

I've just inherited a project which was maintained using Git. At one point, the code was deployed onto 3 separate systems and each system maintained their own decentralised Git respository. Each of the 3 systems extended the original base system in 3 different directions. None of the 3 systems have been synchronised against each other. Some changes are on master branch, others are on new branches. How can I bring the 3 different sources together so that I can: find a common base to work with; find out which changes are bug fixes which should be applied across all 3 systems; and maintain the 3

Is there a way to configure Mercurial to allow for empty commit messages? If you try hg commit through the CLI without entering a commit message, the commit is canceled with: abort: empty commit message . Now, I know that committing without a message is usually considered bad form, but does Mercurial allow it at all? You can use just a space, but I'd really discourage it: hg commit -m " " If the problem is that you don't want to enter the -m "blah" part you can always set up an alias. e.g. in hgrc [alias] qcommit = commit -m "quick commit - no message" If you don't like qcommit then you can

I've noticed that some answers to questions about branch names quote the Mercurial wiki to indicate that the branch-per-feature or branch-per-bug naming conventions may cause performance problems. Does the ability to mark branches as closed with the --close-branch flag on commits have any affect on this performance claim? Martin Geisler Does the ability to mark branches as closed with the --close-branch flag on commits have any affect on this performance claim? Marking a branch closed with hg commit --close-branch merely creates a new changeset with a close=1 marker in the changeset meta data.