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

Mismatch docs/code. WAS: RE: svn commit: rev 1774 - trunk/subversion/include trunk/subversion/libsvn_delta

From: Sander Striker <striker_at_apache.org>
Date: 2002-04-25 12:26:40 CEST

Hi,

> + /* Two-way and three-way diffs both call the first two output functions: */
> +
> + /* If doing a two-way diff, then an *identical* data range was found
> + between the "original" and "modified" datasources. Specifically,
> + the match is from ORIGINAL_START to ORIGINAL_END in the original
> + data, and from MODIFIED_START to MODIFIED_END in the modified
> + data.
> +
> + If doing a three-way diff, then all three datasources have
> + matching data ranges. The range LATEST_START to LATEST_END in
> + the "latest" datasource is identical to the range ORIGINAL_START
> + to ORIGINAL_END in the original data, and is also identical to
> + the range MODIFIED_START to MODIFIED_END in the modified
> + data. */
> + void (*output_common) (void *output_baton,
> + apr_off_t original_start,
> + apr_off_t original_end,
> + apr_off_t modified_start,
> + apr_off_t modified_end,
> + apr_off_t latest_start,
> + apr_off_t latest_end);

Because I missed a rename in the code before committing we now have
_end in the .h file and _length in the .c file. I'm going to let them
match up again, but would like some feedback to what is preferred.

Do we want ranges to be represented by:

  START - END e.g. 0 - 3 translates to [0, 1, 2]

or:

  START, LENGTH e.g. 3, 3 means [3, 4, 5]

Thoughts?

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 25 12:20:10 2002

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