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

Diff lib commit, WAS: RE: svn commit: rev 1752 - trunk/subversion trunk/subversion/include trunk/subversion/libsvn_diff

From: Sander Striker <striker_at_apache.org>
Date: 2002-04-23 22:20:39 CEST

> From: striker@tigris.org [mailto:striker@tigris.org]
> Sent: 23 April 2002 22:03

> Author: striker
> Date: 2002-04-23 20:02 GMT
> New Revision: 1752
>
> Added:
> trunk/subversion/include/svn_diff.h
> trunk/subversion/libsvn_diff/
> trunk/subversion/libsvn_diff/diff.c
> Log:
> Initial commit of the diff lib.

Some notes on this initial commit. We can do a lot better when it
comes to conflict resolution. No need to do the 'hunk' thing.
However, this introduces a problem in the API (output). IOW, this
needs some thought. There is a big fat comment at the location where
the improvement can be done.

Things to be done:
 - add comments
 - add wrappers (svn_diff_file, svn_diff3_file, svn_diff_output_unified)
 - do better conflict resolution
 - write tests
 - investigate if the support structs/funcs (the hat stuff) can
   be replaced with apr support structs/funcs.

This patch enables the diff lib build:

Index: ./build.conf
===================================================================
--- ./build.conf
+++ ./build.conf Sat Apr 13 14:11:51 2002
@@ -103,6 +103,13 @@
 path = subversion/libsvn_delta
 libs = libsvn_subr $(SVN_APR_LIBS)

+# Routines for diffing
+[libsvn_diff]
+type = lib
+install = base-lib
+path = subversion/libsvn_diff
+libs = libsvn_subr $(SVN_APR_LIBS)
+
 # The repository filesystem library
 [libsvn_fs]
 type = lib

I used the attached file for simple testing.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Tue Apr 23 22:14:46 2002

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