水银工作流程的问题（如何处理配置文件） [英] Mercurial workflow question (how to handle Config files)

问题描述

我有一个长期存在的问题：在工作中我们使用水银作为DSCM，但我们不能找出如何保持同步我们的配置文件。

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.

现在的问题是，我们要跟踪的配置文件，并希望能够在开发者交流的配置文件中的内容，但每一个开发商都想拥有自己的connectionStrings节独立于其他。

The problem is that we want to keep track of config files and want to be able to exchange the config file contents among developers, but every developer wants to have his connectionStrings section independent of others'.

是否有可能以某种方式继续跟踪，但推拉时，可以省略连接字符串部分配置文件？

Is it possible to somehow keep config files tracked but to omit the connection strings section when pulling and pushing?

我们尝试添加配置文件到.hgignore，但是当有人增加了一些重要的配置文件，我们必须通过电子邮件分享吧。

We tried adding config files to .hgignore but when someone adds something important to config file we have to share it by email.

感谢你。

推荐答案

如果您不能处理它与包括自定义设置，只需在回购基本配置文件。

If you can't deal with it with the inclusion of custom settings, just have a base config file in the repo.

然后让每个开发人员把它自己的定制之上（含MQ）。如果自定义不是太冒昧合并将永远幸福下去。

Then have each developer put it's own customization on top (with mq). If the customization isn't too intrusive the merge will always go well.

还有另外一种方法，在您反复推你要记住不要推合并分支时，合并您的自定义，但随后（ TX 是主线， C1 是定制）

There is another way, where you repeatedly merge your customization, but then when pushing you have to remember not to push the merge branch (tX is mainline, c1 is the customization)

t1-t2-t3-t4-...-tN
  \    \      \   \
   c1---c2-----c3--c4

dev的需求，推动谁只有改变 TX 作为父母， CX 不应该逃脱回购。

The dev needs and push changes who only have tX as parents, cX should never escape the repo.

这篇关于水银工作流程的问题（如何处理配置文件）的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！