subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1302888 - in /subversion/branches/1.6.x: ./ STATUS subversion/libsvn_fs_fs/fs_fs.c
Date Tue, 20 Mar 2012 13:40:13 GMT
Author: stsp
Date: Tue Mar 20 13:40:13 2012
New Revision: 1302888

URL: http://svn.apache.org/viewvc?rev=1302888&view=rev
Log:
On the 1.6.x branch, merge r1230212 from trunk via the 1.6.x-r1230212 branch.

 * r1230212
   Fix for large files on 32-bit systems.
   Justification:
     Can corrupt FSFS repositories.
   Branch:
     ^/subversion/branches/1.6.x-r1230212
   Votes:
     +1: philip, stsp, rhuijben

Modified:
    subversion/branches/1.6.x/   (props changed)
    subversion/branches/1.6.x/STATUS
    subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c

Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
  Merged /subversion/branches/1.6.x-r1230212:r1241382-1302885
  Merged /subversion/trunk:r1230212

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1302888&r1=1302887&r2=1302888&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Mar 20 13:40:13 2012
@@ -233,12 +233,3 @@ Approved changes:
      - the installed ctypes-python bindings 'egg-info' file.
    Votes:
      +1: julianfoad, stsp, rhuijben
-
- * r1230212
-   Fix for large files on 32-bit systems.
-   Justification:
-     Can corrupt FSFS repositories.
-   Branch:
-     ^/subversion/branches/1.6.x-r1230212
-   Votes:
-     +1: philip, stsp, rhuijben

Modified: subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1302888&r1=1302887&r2=1302888&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c Tue Mar 20 13:40:13 2012
@@ -2353,7 +2353,7 @@ struct rep_args
 
   svn_revnum_t base_revision;
   apr_off_t base_offset;
-  apr_size_t base_length;
+  svn_filesize_t base_length;
 };
 
 /* Read the next line from file FILE and parse it as a text
@@ -2407,7 +2407,7 @@ read_rep_line(struct rep_args **rep_args
 
   str = apr_strtok(NULL, " ", &last_str);
   if (! str) goto err;
-  rep_args->base_length = (apr_size_t) apr_atoi64(str);
+  rep_args->base_length = (svn_filesize_t) apr_atoi64(str);
 
   *rep_args_p = rep_args;
   return SVN_NO_ERROR;



Mime
View raw message