Avoiding massive merges

[Brendan Cully]

On Thursday, 06 September 2007 at 14:25, John Levon wrote:
> 
> We have a Xen 3.0.4 tree, like this:
> 
>    | xen
>    |
>    |\ 3.0.4-branched
>    | \
>    |  \
>    |   \_ 3.0.4 (our tree)
>    |
>    |
>    |\ 3.1-branched
>    | \
>    |  \_ 3.1
> 
> 
> Moving from the branched 3.0.4 to the branched 3.1 involves a ginormous
> merge. Any suggestions for a strategy? I think I need an 'hgmerge' that
> simply accepts the new version of the clashing files, or is there a
> better way?
> 
> What do other people do in such circumstances?

dirty, but fast:

hg up -C 3.1
hg debugsetparents 3.1 3.0.4
hg commit -m'"merge" 3.0.4 into 3.1'