You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2018/03/16 00:00:24 UTC
svn commit: r1826907 -
/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
Author: philip
Date: Fri Mar 16 00:00:23 2018
New Revision: 1826907
URL: http://svn.apache.org/viewvc?rev=1826907&view=rev
Log:
Fix issue 4727 which is a bug in the fix for issue 4725.
* subversion/libsvn_fs_fs/cached_data.c
(cache_windows): Move auto_read_diff_version() call before the loop.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1826907&r1=1826906&r2=1826907&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Fri Mar 16 00:00:23 2018
@@ -3270,6 +3270,9 @@ cache_windows(svn_fs_t *fs,
apr_pool_t *pool)
{
apr_pool_t *iterpool = svn_pool_create(pool);
+
+ auto_read_diff_version(rs, iterpool);
+
while (rs->current < rs->size)
{
apr_off_t end_offset;
@@ -3310,8 +3313,6 @@ cache_windows(svn_fs_t *fs,
apr_size_t window_len;
char *buf;
- auto_read_diff_version(rs, iterpool);
-
/* navigate to the current window */
SVN_ERR(rs_aligned_seek(rs, NULL, start_offset, iterpool));
SVN_ERR(svn_txdelta__read_raw_window_len(&window_len,
Re: svn commit: r1826907 -
/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
philip@apache.org wrote on Fri, 16 Mar 2018 00:00 +0000:
> Fix issue 4727 which is a bug in the fix for issue 4725.
>
> * subversion/libsvn_fs_fs/cached_data.c
> (cache_windows): Move auto_read_diff_version() call before the loop.
> +++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
> @@ -3270,6 +3270,9 @@ cache_windows(svn_fs_t *fs,
> + auto_read_diff_version(rs, iterpool);
Missing SVN_ERR() around this function call.
Re: svn commit: r1826907 -
/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
philip@apache.org wrote on Fri, 16 Mar 2018 00:00 +0000:
> Fix issue 4727 which is a bug in the fix for issue 4725.
>
> * subversion/libsvn_fs_fs/cached_data.c
> (cache_windows): Move auto_read_diff_version() call before the loop.
> +++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
> @@ -3270,6 +3270,9 @@ cache_windows(svn_fs_t *fs,
> + auto_read_diff_version(rs, iterpool);
Missing SVN_ERR() around this function call.