Subject: Re: Merge seems to get confused by (reverted) cherry-picks

From: Andreas Ericsson <[email-masked]>
Date: Wed, 03 Sep 2008 13:04:23 +0200

Ittay Dror wrote:
> Note: codeville tried to implement a merge algorithm that considers the 
> history to decide what the user wants to do: 
> http://revctrl.org/PreciseCodevilleMerge. Maybe worth while exploring?
> 

I believe that one would still fail for this case, as "ImplicitUndo"
isn't included.

Besides that, I'd rather have something simple that does something
predictable than something complex that pushes the "gets it right"
figure from 98% to 99.2%, while failing in completely annoying and
surprising ways sometimes. Someone or something still has to verify
that the merge produced something sane.

-- 
Andreas Ericsson                   [email-masked]
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231