Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (athena.apache.org: domain of jcorvel@gmail.com designates
 209.85.214.171 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to
         :content-type;
        b=fB8XQoHeFbhIAt3hUnxkm4OAtT/+6AQ351j2rbZacf5cVRPS6ng6bl92Tnumt18T8y
         TvmGSNkoGpF5vC4hed8VUDX0kdiLcAQkADp7LVDH9PA8pIozVlOrCZI5UrtYGTJ2TRJm
         8mHTGEnvn9XffZUD2pLbyUpfhOTKmjP+3fXX0=
MIME-Version: 1.0
In-Reply-To: <20110113130734.GC263@jack.stsp.name>
References: 
 <C002E55DEEE4FD499244C8C3A5A81D0F8C18B32133@GVW1093EXB.americas.hpqcorp.net>
 <AANLkTik12DV0MHMOo6MNR+BjkpfsRm89PQJ4uWEAhtrd@mail.gmail.com>
 <20110113130734.GC263@jack.stsp.name>
From: Johan Corveleyn <jcorvel@gmail.com>
Date: Thu, 13 Jan 2011 15:25:35 +0100
Message-ID: <AANLkTikdc2mJ4aW_sKigyT6Ce6e6ods6A4QOSHz3ftJO@mail.gmail.com>
Subject: Re: Trival merge of big text file: Dismal performance,
 540x faster if binary.
To: =?ISO-8859-1?Q?krueger=2C_Andreas_=28Andreas_Kr=FCger=2C_DV=2DRATIO=29?=
 <andreas.krueger@hp.com>,
	"users@subversion.apache.org" <users@subversion.apache.org>
Content-Type: text/plain; charset=ISO-8859-1

On Thu, Jan 13, 2011 at 2:07 PM, Stefan Sperling <stsp@elego.de> wrote:
> On Thu, Jan 13, 2011 at 01:55:58PM +0100, Johan Corveleyn wrote:
>> Textual merging in svn makes use of a variant of the standard diff
>> algorithm, namely diff3. Just a couple of days ago, I finally
>> succeeded in making diff3 take advantage of those performance
>> improvements (haven't committed this to the branch yet, but maybe I'll
>> get to it tonight).
>>
>> Would you be able to build an svn client from source? If so, could you
>> perhaps build a client from
>> http://svn.apache.org/repos/asf/subversion/branches/diff-optimizations-bytes
>> ?
>
> Hey Johan,
>
> I would be interested in doing testing and reviewing the changes
> on your branch. There might still be enough time to get them into 1.7.

Thanks, that would be great (btw, danielsh also expressed an interest
in reviewing the branch). I will try to give an status update on the
dev-list after I've committed the changes for diff3.

> I don't have any suitably large XML files though.
> If you and/or Andreas could provide some that would be great.

I was thinking of writing a python script (as philip already
suggested) that can generate several variants of large files with
semi-random data. I have some prototype code for this lying around, so
if I find the time, I'll try to wrap this up and send it to the dev
list. OTOH, real-world examples are probably even better.

Cheers,
-- 
Johan