[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging bug (wrong conflicts)

From: Karl Tomlinson
Subject: Re: Merging bug (wrong conflicts)
Date: Tue, 20 Feb 2001 20:14:50 +1300

Karl Tomlinson wrote:
> 2&3)
> Both depend on a difference between files that can be represented
> by more than one minimal hunk.
> An example is
> Difference A:
>  1  2
>  x  y
>  m  m
>  x  y
>     m
>     y
> Does the m in file 1 match the first or second m in file 2?
> The logic in diag and compareseq is not consistent in analyze.c.
> The match selected depends on where in the file this difference occurs
> and on the surrounding differences.

It seems more complicated than I thought.  I haven't been able to
come up with any examples based on differences such as this or

reply via email to

[Prev in Thread] Current Thread [Next in Thread]