subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r906214 - /subversion/trunk/subversion/libsvn_client/patch.c
Date Wed, 03 Feb 2010 20:07:59 GMT
Author: stsp
Date: Wed Feb  3 20:07:59 2010
New Revision: 906214

URL: http://svn.apache.org/viewvc?rev=906214&view=rev
Log:
* subversion/libsvn_client/patch.c
  (apply_one_patch): Close streams also for targets which are skipped.

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=906214&r1=906213&r2=906214&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Wed Feb  3 20:07:59 2010
@@ -1099,18 +1099,18 @@
         }
     }
 
+  /* Close the streams of the target so that their content is
+   * flushed to disk. This will also close underlying streams. */
+  if (target->kind == svn_node_file)
+    SVN_ERR(svn_stream_close(target->stream));
+  SVN_ERR(svn_stream_close(target->patched));
+  SVN_ERR(svn_stream_close(target->reject));
+
   if (! target->skipped)
     {
       apr_finfo_t working_file;
       apr_finfo_t patched_file;
 
-      /* Close the streams of the target so that their content is
-       * flushed to disk. This will also close underlying streams. */
-      if (target->kind == svn_node_file)
-        SVN_ERR(svn_stream_close(target->stream));
-      SVN_ERR(svn_stream_close(target->patched));
-      SVN_ERR(svn_stream_close(target->reject));
-
       /* Get sizes of the patched temporary file and the working file.
        * We'll need those to figure out whether we should delete the
        * patched file. */



Mime
View raw message