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

Re: Problem invoking diff3.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-05-16 00:22:51 CEST

Garrett Rooney <rooneg@electricjellyfish.net> writes:

> seriously, i think this is a hell of a good reason to start putting
> more work into sander's internal diff library. being dependent on
> external tools like this is an inherantly problematic arrangement.

The Collabnet folks (me, kfogel, gstein, cmpilato) don't really have
time to spend on making Sander's code work, but I would be *thrilled*
if someone else got it up to speed... preferably sooner rather than
later, because Alpha is approaching soon, and it would be nice to have
a long testing period. The API is fully documented in svn_diff.h.

Here's the todo list:

 1. Sander already wrote an output-vtable that produces unified diff
    between two sources. Someone needs to write an output-vtable to
    produce a 'merged' file with conflict markers when doing a 3 way
    diff. Sander and I have already discussed how to do it; the
    interface is clear. It's just a matter of someone spending a day
    or two writing it.

 2. Need to wrap svn_io_run_diff[3] functions around the new
    svn_diff.h API. Pretty easy.

 3. Need one hell of a test suite for the library.

Number 3 is the Big Problem. Even Sander himself admits that there
are bugs in RAM consumption in his algorithms. They need to be
optimized and tested to *death*.

Maybe someone will get inspired here... I hate having external
dependencies, especially on Win32.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu May 16 00:26:57 2002

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