subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1717864 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Date Thu, 03 Dec 2015 22:54:07 GMT
Author: stefan2
Date: Thu Dec  3 22:54:07 2015
New Revision: 1717864

URL: http://svn.apache.org/viewvc?rev=1717864&view=rev
Log:
Revert r1712927 because that check is actually required.

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=1717864&r1=1717863&r2=1717864&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Dec  3 22:54:07 2015
@@ -1416,8 +1416,8 @@ svn_fs_fs__file_text_rep_equal(svn_boole
   svn_stream_t *contents_a, *contents_b;
   representation_t *rep_a = a->data_rep;
   representation_t *rep_b = b->data_rep;
-  svn_boolean_t a_empty = !rep_a;
-  svn_boolean_t b_empty = !rep_b;
+  svn_boolean_t a_empty = !rep_a || rep_a->expanded_size == 0;
+  svn_boolean_t b_empty = !rep_b || rep_b->expanded_size == 0;
 
   /* This makes sure that neither rep will be NULL later on */
   if (a_empty && b_empty)



Mime
View raw message