subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1707586 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Thu, 08 Oct 2015 17:11:44 GMT
Author: ivan
Date: Thu Oct  8 17:11:44 2015
New Revision: 1707586

URL: http://svn.apache.org/viewvc?rev=1707586&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_prop_conflict_on_node): Use svn_stringbuf_from_file2() and
   svn_stringbuf__morph_into_string() instead of svn_stream_open_readonly()
   and svn_string_from_stream().

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

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1707586&r1=1707585&r2=1707586&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Oct  8 17:11:44 2015
@@ -2472,15 +2472,12 @@ resolve_prop_conflict_on_node(svn_boolea
 
           if (!merged_value)
             {
-              svn_stream_t *stream;
-              svn_string_t *merged_propval;
+              svn_stringbuf_t *merged_propval;
 
-              SVN_ERR(svn_stream_open_readonly(&stream, merged_file,
-                                               scratch_pool, scratch_pool));
-              SVN_ERR(svn_string_from_stream(&merged_propval, stream,
-                                             scratch_pool, scratch_pool));
+              SVN_ERR(svn_stringbuf_from_file2(&merged_propval, merged_file,
+                                               scratch_pool));
 
-              merged_value = merged_propval;
+              merged_value = svn_stringbuf__morph_into_string(merged_propval);
             }
           svn_hash_sets(resolve_from, conflicted_propname, merged_value);
         }



Mime
View raw message