From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 31 Dec 2006 01:09:55 GMT
Subject: Re: [PATCH] xdl_merge(): fix a segmentation fault when refining conflicts
Message-ID: <Pine.LNX.4.63.0612310208460.25709@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <en6fj1$ji5$1@sea.gmane.org>

Hi,

On Sat, 30 Dec 2006, Jakub Narebski wrote:

> Johannes Schindelin wrote:
> 
> > Of course, you can hit mismerges like the illustrated one _without_ 
> > being marked as conflict (e.g. if the chunk of identical code is _not_ 
> > added, but only the increments), but we should at least avoid them 
> > where possible.
> 
> Perhaps you could make it even more conservating merge conflicts option 
> (to tighten merge conflicts even more) to xdl_merge, but not used by 
> default because as it removes accidental conflicts it increases 
> mismerges (falsely not conflicted).

There is no way to do this sanely. If you want to catch these mismerges, 
you have to mark _all_ modifications as conflicting.

Ciao,
Dscho