[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Simplification/speed-up of libsvn_diff by eliminating idx

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Wed, 01 Jun 2011 09:04:27 +0100

Stefan Fuhrmann <eqfox_at_web.de> writes:

>> Updated log message:
>> [[[
>> Simpler/faster LCS algorithm in libsvn_diff by elimination of idx.
>>
>> * subversion/libsvn_diff/lcs.c
>> (svn_diff__snake): Removed idx parameter (always 0)
>> (svn_diff__lcs): Removed idx variable (always 0) , let d have either
>> sign, and moved the origo of fp by d. New version no longer chooses
>> the shorter file as the "original", and can thus give different LCS's
>> depending on the order of the input files even when the files have
>> different lengths. Speed is ~15% faster for core lcs algorithm.
>> ]]]
> Committed as r1128857. I took the liberty to
> weaken the speed-up claim.

This commit fixed the spurious conflict on update in issue 3449, I
suppose the chosen LCS is "better" in this particular case. Are there
likely to be cases where the chosen LCS is "worse" so that previously
clean merges are now conflicts?

See r1130036 for a 3449 regression test.

-- 
Philip
Received on 2011-06-01 10:05:10 CEST

This is an archived mail posted to the Subversion Dev mailing list.