Question

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.

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

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?

Answer 1

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