Re: [Gnu-arch-users] Star-merge Fatally Wounded

[David Allouche]

On Fri, 2004-09-10 at 20:00 -0400, Adrian Irving-Beer wrote:
>         * Star-merge B into A works (but that's a false positive due
>           to too little input data; it fuzzies and does it wrong).
> 
>         * Star-merge A into B fails due to conflict.
> 
>         * Star-merge either using --three-way works perfectly.
> 
> Interestingly, even though --three-way reports adding two patch logs
> and modifying the file (*not* a conflict), it only adds one patch log
> and doesn't make any changes to the file.  Essentially, the merge
> becomes a no-op (as one would expect).
> 
> Is the three-way behaviour helpful at all in improving the normal
> behaviour?  Is it only working due to minimal input data?

That's intriguing. I never really quite understood how --three-way
affects the merge logic.

See the attached test case to see that actually it really blows. In one
case it actually successfully and silently do the WRONG thing!

-- 
                                                            -- ddaa

cross-three-way.sh
Description: application/shellscript