subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1706599 - /subversion/trunk/subversion/libsvn_client/patch.c
Date Sat, 03 Oct 2015 15:14:32 GMT
Author: rhuijben
Date: Sat Oct  3 15:14:32 2015
New Revision: 1706599

URL: http://svn.apache.org/viewvc?rev=1706599&view=rev
Log:
Apply a minor theoretical consistency fix. (Property operations are ram->ram)

* subversion/libsvn_client/patch.c
  (apply_one_patch): On error copying the property, only skip the property.

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=1706599&r1=1706598&r2=1706599&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Sat Oct  3 15:14:32 2015
@@ -2774,9 +2774,9 @@ apply_one_patch(patch_target_t **patch_t
           if (! prop_target->content->eof)
             {
               /* We could not copy the entire target property to the
-               * temporary file, and would truncate the target if we
-               * copied the temporary file on top of it. Skip this target.  */
-              target->skipped = TRUE;
+               * temporary stream, and would truncate the target if we
+               * copied the temporary stream on top of it. Skip this target. */
+              prop_target->skipped = TRUE;
             }
         }
       }



Mime
View raw message