svn commit: r1125107 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

[rh...@apache.org]

Author: rhuijben
Date: Thu May 19 21:12:54 2011
New Revision: 1125107

URL: http://svn.apache.org/viewvc?rev=1125107&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
  (change_dir_prop,
   change_file_prop): Handle dav cache properties like entry properties: they
     shouldn't induce tree conflicts without other changes.

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

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1125107&r1=1125106&r2=1125107&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu May 19 21:12:54 2011
@@ -2357,7 +2357,7 @@ change_dir_prop(void *dir_baton,
   propchange->name = apr_pstrdup(db->pool, name);
   propchange->value = value ? svn_string_dup(value, db->pool) : NULL;
 
-  if (!db->edited && svn_property_kind(NULL, name) != svn_prop_entry_kind)
+  if (!db->edited && svn_property_kind(NULL, name) == svn_prop_regular_kind)
     SVN_ERR(mark_directory_edited(db, pool));
 
   return SVN_NO_ERROR;
@@ -3472,7 +3472,7 @@ change_file_prop(void *file_baton,
   propchange->name = apr_pstrdup(fb->pool, name);
   propchange->value = value ? svn_string_dup(value, fb->pool) : NULL;
 
-  if (!fb->edited && svn_property_kind(NULL, name) != svn_prop_entry_kind)
+  if (!fb->edited && svn_property_kind(NULL, name) == svn_prop_regular_kind)
     SVN_ERR(mark_file_edited(fb, scratch_pool));
 
   return SVN_NO_ERROR;