subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1435003 - /subversion/trunk/subversion/libsvn_wc/merge.c
Date Fri, 18 Jan 2013 01:44:56 GMT
Author: julianfoad
Date: Fri Jan 18 01:44:55 2013
New Revision: 1435003

URL: http://svn.apache.org/viewvc?rev=1435003&view=rev
Log:
* subversion/libsvn_wc/merge.c
  (detranslate_wc_file): Adjust comment following r1434444.

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=1435003&r1=1435002&r2=1435003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Fri Jan 18 01:44:55 2013
@@ -173,9 +173,7 @@ detranslate_wc_file(const char **detrans
     new_is_binary = new_mime_value && svn_mime_type_is_binary(new_mime_value);;
   }
 
-  /* See if we need to do a straight copy:
-     - old and new mime-types are binary, or
-     - old mime-type is binary and no new mime-type specified */
+  /* See if we need to do a straight copy: old and new mime-types are binary */
   if (old_is_binary && new_is_binary)
     {
       /* this is case IV above */



Mime
View raw message