subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1361019 - /subversion/trunk/subversion/libsvn_wc/merge.c
Date Fri, 13 Jul 2012 00:39:33 GMT
Author: rhuijben
Date: Fri Jul 13 00:39:33 2012
New Revision: 1361019

URL: http://svn.apache.org/viewvc?rev=1361019&view=rev
Log:
* subversion/libsvn_wc/merge.c
  (merge_file_trivial): Following up on r1361007, keep the cats away from our
    pristine files. Or really fix an uninitalized variable, that makes us
    delete files that we want to keep.

Modified:
    subversion/trunk/subversion/libsvn_wc/merge.c

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1361019&r1=1361018&r2=1361019&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Fri Jul 13 00:39:33 2012
@@ -673,7 +673,8 @@ merge_file_trivial(svn_skel_t **work_ite
           if (!dry_run)
             {
               const char *wcroot_abspath;
-              svn_boolean_t delete_src;
+              svn_boolean_t delete_src = FALSE;
+
               /* The right_abspath might be outside our working copy. In that
                  case we should copy the file to a safe location before
                  installing to avoid breaking the workqueue */



Mime
View raw message