subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1706609 - /subversion/trunk/subversion/libsvn_client/patch.c
Date Sat, 03 Oct 2015 16:28:31 GMT
Author: rhuijben
Date: Sat Oct  3 16:28:31 2015
New Revision: 1706609

URL: http://svn.apache.org/viewvc?rev=1706609&view=rev
Log:
* subversion/libsvn_client/patch.c
  (apply_one_patch): Following up on r1706598, add brackets.

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=1706609&r1=1706608&r2=1706609&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Sat Oct  3 16:28:31 2015
@@ -2878,8 +2878,8 @@ apply_one_patch(patch_target_t **patch_t
 
           if (has_adds && !has_mods && !has_deletes)
             ensure_exists = TRUE;
-          else if (has_mods && target->locally_deleted
-                   || target->kind_on_disk == svn_node_none)
+          else if (has_mods && (target->locally_deleted
+                                || target->kind_on_disk == svn_node_none))
             {
               target->had_prop_rejects = TRUE;
               for (hash_index = apr_hash_first(scratch_pool, target->prop_targets);



Mime
View raw message