You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/04/16 22:01:22 UTC
svn commit: r1094040 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Sat Apr 16 20:01:22 2011
New Revision: 1094040
URL: http://svn.apache.org/viewvc?rev=1094040&view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
(rep_write_get_baton): Use non-deprecated svn_txdelta_to_svndiff3 instead
of svn_txdelta_to_svndiff2.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1094040&r1=1094039&r2=1094040&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Sat Apr 16 20:01:22 2011
@@ -5495,6 +5495,7 @@ rep_write_get_baton(struct rep_write_bat
svn_txdelta_window_handler_t wh;
void *whb;
fs_fs_data_t *ffd = fs->fsap_data;
+ int diff_version = ffd->format >= SVN_FS_FS__MIN_SVNDIFF1_FORMAT ? 1 : 0;
b = apr_pcalloc(pool, sizeof(*b));
@@ -5540,10 +5541,12 @@ rep_write_get_baton(struct rep_write_bat
SVN_ERR(get_file_offset(&b->delta_start, file, b->pool));
/* Prepare to write the svndiff data. */
- if (ffd->format >= SVN_FS_FS__MIN_SVNDIFF1_FORMAT)
- svn_txdelta_to_svndiff2(&wh, &whb, b->rep_stream, 1, pool);
- else
- svn_txdelta_to_svndiff2(&wh, &whb, b->rep_stream, 0, pool);
+ svn_txdelta_to_svndiff3(&wh,
+ &whb,
+ b->rep_stream,
+ diff_version,
+ SVN_DEFAULT_COMPRESSION_LEVEL,
+ pool);
b->delta_stream = svn_txdelta_target_push(wh, whb, source, b->pool);