svn commit: r1144234 - in /subversion/trunk/subversion: libsvn_wc/props.c tests/cmdline/prop_tests.py

[ph...@apache.org]

Author: philip
Date: Fri Jul  8 10:03:47 2011
New Revision: 1144234

URL: http://svn.apache.org/viewvc?rev=1144234&view=rev
Log:
Fix issue 3951, property merge notification with serf and 1.6 mod_dav_svn.

* subversion/libsvn_wc/props.c
  (apply_single_generic_prop_change): Avoid 'G' for trivial merge.

* subversion/tests/cmdline/prop_tests.py
  (update_props): Decorate with issue number.

Modified:
    subversion/trunk/subversion/libsvn_wc/props.c
    subversion/trunk/subversion/tests/cmdline/prop_tests.py

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1144234&r1=1144233&r2=1144234&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Fri Jul  8 10:03:47 2011
@@ -1393,7 +1393,9 @@ apply_single_generic_prop_change(svn_wc_
   if (working_val && new_val
       && svn_string_compare(working_val, new_val))
     {
-       set_prop_merge_state(state, svn_wc_notify_state_merged);
+      /* All values identical is a trivial, non-notifiable merge */
+      if (! old_val || ! svn_string_compare(old_val, new_val))
+        set_prop_merge_state(state, svn_wc_notify_state_merged);
     }
   /* If working_val is the same as old_val... */
   else if (working_val && old_val

Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1144234&r1=1144233&r2=1144234&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Fri Jul  8 10:03:47 2011
@@ -138,6 +138,7 @@ def commit_props(sbox):
 
 #----------------------------------------------------------------------
 
+@Issue(3951)
 def update_props(sbox):
   "receive properties via update"