确保分支之间的合并发生在一个方向上 [英] Ensuring a merge between branches happens in one direction

问题描述

今天早上，我发现我的同事错误地合并了两个分支之间的方式-我们有一个ver5和ver6分支，在ver6中有多余的文件.是否有任何方法(可能是服务器端挂钩)强制任何ver5节点的子代来自ver5?

This morning I discovered that my co-worker had merged the wrong way between two branches in mercurial --we have a ver5 and ver6 branch, with extra files in ver6. Is there any way (a serverside hook probably) to enforce that the children of any ver5 node be from ver5?

推荐答案

我对" Mercurial:允许从发布分支合并到默认分支的合并，但反之亦然而不是两次发布 >"帮助? https://stackoverflow.com/a/19926324/1025457

Rather than post twice, would my answer to "Mercurial: allow merge from a release branch to the default one, but not vice versa" help? https://stackoverflow.com/a/19926324/1025457

这篇关于确保分支之间的合并发生在一个方向上的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！