Question

Ok

We work with ASP.net applications at my company, so we have to deal with the lovely web.config setup in order to save settings and stuff.

As each person has a different version of this file, we have the one for the build server checked in in Merc, and each person just works with a permanently checked out copy.

This workflow was fine in Perforce, as it did merges on a file-by-file basis, however mercurial forces you to merge your web.config when you merge heads.

Does anyone know if it's possible to exclude this file from merges, or even better just have an unversioned copy in your local repo?

Cheers.

Answer 1

You can add following lines to your hgrc file to keep your version of file without merging with other changes:

[merge-patterns]
web.config = internal:local

Detailed information is here.

Also you can use Perforce merge tool (it's free) if you like the way Perforce does it. Here you can find how to configure Perforce merge tool to use it with Mercurial.

Answer 2

Add web.config to the .hgignore file, that way it will be ignored by mercurial.