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/02/19 11:20:11 UTC

svn commit: r1072297 - /subversion/branches/integrate-io-improvements/subversion/libsvn_subr/io.c

Author: stefan2
Date: Sat Feb 19 10:20:10 2011
New Revision: 1072297

URL: http://svn.apache.org/viewvc?rev=1072297&view=rev
Log:
Fix special case in file comparison code posted here:
http://svn.haxx.se/dev/archive-2011-02/0392.shtml

* subversion/libsvn_subr/io.c
  (contents_identical_p): handle special case

Found by: danielsh

Modified:
    subversion/branches/integrate-io-improvements/subversion/libsvn_subr/io.c

Modified: subversion/branches/integrate-io-improvements/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-io-improvements/subversion/libsvn_subr/io.c?rev=1072297&r1=1072296&r2=1072297&view=diff
==============================================================================
--- subversion/branches/integrate-io-improvements/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/integrate-io-improvements/subversion/libsvn_subr/io.c Sat Feb 19 10:20:10 2011
@@ -3831,6 +3831,11 @@ contents_identical_p(svn_boolean_t *iden
         }
     }
 
+  /* Special case: one file being a prefix of the other and the shorter
+   * file's size is a multiple of SVN__STREAM_CHUNK_SIZE. */
+  if (!err && (eof1 != eof2))
+    *identical_p = FALSE;
+
   return svn_error_return(
            svn_error_compose_create(
                 err,