From: Daniel Barkalow Date: Thu, 28 Apr 2005 01:16:34 GMT Subject: Re: The criss-cross merge case Message-ID: In-Reply-To: <42703194.80409@tupshin.com> On Wed, 27 Apr 2005, Tupshin Harper wrote: > Can you clarify what you mean by darcs' underlying diff not being that > great? It seems to function pretty much identically to gnu diff. In what > way would you want the underlying diff to be improved? GNU diff uses an algorithm which is tuned to handle finding the shortest diff among a large set of similar-length alternatives while comparing files which have a lot of repeated lines. The author of the paper it cites is really thinking about diffing DNA sequences or similar things. It also can't detect content moves, which are a common thing to have, and which will be important in the long run, when we're trying to track modifications to content which also moved from place to place. -Daniel *This .sig left intentionally blank*