svn commit: r1441641 - /subversion/trunk/subversion/libsvn_wc/diff_editor.c

[rh...@apache.org]

Author: rhuijben
Date: Fri Feb  1 21:35:57 2013
New Revision: 1441641

URL: http://svn.apache.org/viewvc?rev=1441641&view=rev
Log:
Following up on r1441276 and r1441280, reinstate the checks on just the number
of received property changes (which is always > 0), as more code than expected
was relying on always seeing these property changes. Without this certain local
changes are reported via different code paths which produced unexpected
results.

* subversion/libsvn_wc/diff_editor.c
  (close_directory,
   close_file): Revert usage of has_propchange as much cheaper check.

Modified:
    subversion/trunk/subversion/libsvn_wc/diff_editor.c

Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1441641&r1=1441640&r2=1441641&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Fri Feb  1 21:35:57 2013
@@ -1322,7 +1322,7 @@ close_directory(void *dir_baton,
   apr_pool_t *scratch_pool = db->pool;
 
   /* Report the property changes on the directory itself, if necessary. */
-  if (db->has_propchange)
+  if (db->propchanges->nelts > 0)
     {
       /* The working copy properties at the base of the wc->repos comparison:
          either BASE or WORKING. */
@@ -1745,11 +1745,9 @@ close_file(void *file_baton,
          fb->propchanges as the change between WORKING and repos. */
       SVN_ERR(svn_prop_diffs(&fb->propchanges,
                              repos_props, originalprops, scratch_pool));
-
-      fb->has_propchange = (fb->propchanges->nelts > 0);
     }
 
-  if (localfile || fb->has_propchange)
+  if (localfile || fb->propchanges->nelts > 0)
     {
       const char *original_mimetype = get_prop_mimetype(originalprops);