views:

31

answers:

1

I have 2 servers with same cloned Mercurial repo but with different config lines in some files in this repo. How can I control this files via Mercurial but haven't problem when pull/puss between servers?

+1  A: 

You should rather have under version control:

  • one config file template
  • two config file values (one per environment)
  • one script able to take the config file template and fill it with the right values depending on the environment.

That way, no problem during pull/push.

VonC