How to pull/merge selective changesets

[Kevin Bullock]

On 19 Aug 2009, at 11:59 AM, Bruce Frederiksen wrote:

> I would like to set up two shared hg repos for the same project:  
> release_1 and dev.
>
> Then after the following sequence of events:
> Push a changeset to release_1 that should only ever be seen in  
> release_1.
> Push a changeset to dev that should only ever be seen in dev.
> Now I want to push a changeset to both repos.

I usually handle this kind of situation with the transplant extension;  
I'll fix something on the default branch and then transplant just that  
changeset to the release branch.

To me, this approach fits well with Mercurial's model of handling  
changes: the patch is the same, but since the history (the series of  
patches leading to the changeset) is divergent on each branch, it  
creates a new changeset with a different ID. The null-merge approach  
seems a bit kludgey to me, but that could be my own lack of experience.

Pacem in terris / Mir / Shanti / Salaam / Heiwa
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090819/2466311d/attachment.htm