Avoiding massive merges

[John Levon]

On Thu, Sep 06, 2007 at 04:01:43PM +0200, Thomas Arendsen Hein 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?
> 
> hg co -C 3.1-head && HGMERGE=true hg merge 3.0.4-ourtree-head
> 
> If 3.1-head is just tip and 3.0.4-ourtree-head is the only other
> head, this could be simplified to:
> 
> hg co -C && HGMERGE=true hg merge

Plus the final step:

hg revert -a -r xen-3.1-testing.hg-head

which will give me a tree that exactly matches 3.1 branch's tip, as
desired

thanks
john