Mercurial workflow question (how to handle Config files)

Question

I have a long standing problem: at work we\'re using mercurial as a DSCM, but we can\'t figure out how to keep our config files in sync.

The problem is that we want

Answer 1

You can use Mercurial Queues to do it. So what you would do is have the "real" config(s) under hg (with their real names), and developers can maintain their customizations using patches which sit on top and are maintained with mq.

Then when developers need to update the real config, they pop their patch which holds all of their customizations off the stack, make the change to the config and commit+push it.

Presuming all other developers haven't overridden those particular changes in their own queues, they will receive them the next time they pull+update.