svn commit: r1705698 - /subversion/trunk/subversion/libsvn_client/patch.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Sep 28 14:23:27 2015
New Revision: 1705698

URL: http://svn.apache.org/viewvc?rev=1705698&view=rev
Log:
Properly notify 'svn patch' conflics on adding and removing properties.

* subversion/libsvn_client/patch.c
  (send_patch_notification): Only filter adds and deletes if they are applied
    without incident.

Modified:
    subversion/trunk/subversion/libsvn_client/patch.c

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1705698&r1=1705697&r2=1705698&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Mon Sep 28 14:23:27 2015
@@ -2262,8 +2262,9 @@ send_patch_notification(const patch_targ
                                  hunk_info_t *);
 
               /* Don't notify on the hunk level for added or deleted props. */
-              if (prop_target->operation != svn_diff_op_added &&
+              if ((prop_target->operation != svn_diff_op_added &&
                   prop_target->operation != svn_diff_op_deleted)
+                  || hi->rejected || hi->already_applied)
                 SVN_ERR(send_hunk_notification(hi, target, prop_target->name,
                                                ctx, iterpool));
             }