Re: [PATCH 0/3] Teach Git about the patience diff algorithm

From: Adeodato Simó <dato@net.com.org.es>
Date: Jan 9, 2009, 15:59 UTC
Message-ID: <20090109155907.GA29039@chistera.yi.org>
In-Reply-To: <alpine.DEB.1.00.0901091405460.30769@pacific.mpi-cbg.de>

* Johannes Schindelin [Fri, 09 Jan 2009 14:07:28 +0100]:

> > If we find the "common" context lines that have only blank and 
> > punctuation letters in Dscho output, turn each of them into "-" and "+", 
> > and rearrange them so that all "-" are together followed by "+", it will 
> > match Bzr output.

> So we'd need something like this (I still think we should treat curly 
> brackets the same as punctuation, and for good measure I just handled 
> everything that is not alphanumerical the same):

Nice. With this patch of yours, --patience --collapse-non-alnums produces the same output as bzr for this last test case (the util_sock.c one). However, also for this last case, without --patience, diff --collapse-non-alnums finds *no* common lines at all. Mentioning in case you'd be interested in knowing.

Cheers,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
- You look beaten.
- I just caught Tara laughing with another man.
- Are you sure they weren't just... kissing or something?
- No, they were laughing.
                -- Denny Crane and Alan Shore