Avoiding massive merges

[Stuart W. Marks]

hg user wrote:
> But I still don't understand what the original poster wanted to do ! 
> Just updating directory or  patching ?
> 
> Francesco

The OP had made a bunch of changes to Xen 3.0.4. Now he's pulled in Xen 3.1 and 
he wants to take the changes they made to 3.0.4 and merge them into 3.1. That's 
why a merge is necessary.

This seems to be a pretty common situation; we run into it too on our project. 
Thanks to the other respondents for the techniques they posted.

s'marks