On Sat, Feb 12, 2011 at 00:38, <jcorvel_at_apache.org> wrote:
> Author: jcorvel
> Date: Fri Feb 11 21:38:55 2011
> New Revision: 1069961
> URL: http://svn.apache.org/viewvc?rev=1069961&view=rev
> Re-enable elimination of the identical suffix for diff (and diff3 (merge) and
> diff4), which was disabled in r1068613 because of truncation of suffix lines
> during merge.
> This time, count the number of suffix lines so we can create an entirely
> correct LCS, also containing the common suffix, so diff3 (merge) can do its
> work properly.
> * subversion/include/svn_diff.h
> (svn_diff_fns2_t): Add a new output parameter SUFFIX_LINES to the
> datasources_open prototype. The svn_diff_fns2_t struct is new in 1.7 (was
> already revved), so we can still do this.
It seems libsvn_diff\deprecated.c:datasources_open() should be updated
to new signature. I get the following warning when compiling:
..\..\..\subversion\libsvn_diff\deprecated.c(128) : warning C4113:
'svn_error_t *(__cdecl *)(void *,apr_off_t *,const
svn_diff_datasource_e *,apr_size_t)' differs in parameter lists from
'svn_error_t *(__cdecl *)(void *,apr_off_t *,apr_off_t *,const
Received on 2011-02-19 20:04:29 CET