subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject svn commit: r930175 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Date Fri, 02 Apr 2010 06:31:11 GMT
Author: gstein
Date: Fri Apr  2 06:31:10 2010
New Revision: 930175

URL: http://svn.apache.org/viewvc?rev=930175&view=rev
Log:
Stupid fucker of a function, svn_wc__internal_translated_file() returns a
"temp file" which isn't always that.

* subversion/libsvn_wc/update_editor.c:
  (merge_file): beware idiocy in other functions

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

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=930175&r1=930174&r2=930175&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Apr  2 06:31:10 2010
@@ -4586,6 +4586,9 @@ merge_file(svn_stringbuf_t **log_accum,
           SVN_WC__FLUSH_LOG_ACCUM(eb->db, pb->local_abspath, *log_accum, pool);
 
           /* Done with the temporary file. Toss it.  */
+          /* ### stupid fucking function sometimes decides NOT to create a
+             ### temp file. but how are we supposed to know?  */
+          if (strcmp(tmptext, fb->local_abspath) != 0)
           {
             const svn_skel_t *work_item;
 
@@ -4597,7 +4600,6 @@ merge_file(svn_stringbuf_t **log_accum,
                                       work_item, pool));
           }
         }
-      /* ### */
     }
 
   /* Deal with installation of the new textbase, if appropriate. */



Mime
View raw message