Different version of file in Mercurial repo

Question

I have 2 servers with the same cloned Mercurial repo, but with different configuration lines in some files in this repo. How can I manage these files through Mercurial, but have no problems when pull / puss between servers?

Answer 1

You must have version control:

• single configuration file template
• two value configuration files (one for each environment)
• one script able to accept the configuration file template and fill it with the correct values ​​depending on the environment.

This way there is no problem during pull / push.