如何使分支与Mercurial下的“默认"分支保持最新状态? [英] How do I keep my branches up to date with the 'default' branch under Mercurial?

问题描述

假设我的Mercurial工作流程如下:

Let's say I have the following workflow with Mercurial:

stable (clone on server)
    default (branch)
    development (clone on server)
        default (branch)
        bugs (branch)
            developer1 (clone on local machine)
            developer2 (clone on local machine)
            developer3 (clone on local machine)
        feature1 (branch)
            developer3 (clone on local machine)
        feature2 (branch)
            developer1 (clone on local machine)
            developer2 (clone on local machine)

我始终处于发布就绪状态的开发主线是默认".因此，开发"克隆中的默认"分支始终可以发布.

My main line of development which is always in a release ready state is 'default'. So the 'default' branch in the 'development' clone is always release-ready.

现在假设我正在开发feature2.再说说feature2需要几个月的时间.

Now suppose I'm developer1 working on feature2. And let's say also that feature2 takes several months.

很明显，我要使'feature2'分支与'default'分支保持最新.这有意义吗?我将如何使用Mercurial做到这一点?

It's pretty obvious that I'm going to want to keep my 'feature2' branch up to date with the 'default' branch. Does this make sense? How would I go about doing this with Mercurial?

推荐答案

对我来说似乎很明显-可能还有其他一些微妙之处，我看不到.合并默认的最新更改.

It seems obvious to me - there might be other subtleties I don't see; merge in the latest changes from default.

这篇关于如何使分支与Mercurial下的“默认"分支保持最新状态?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！