[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1771736 - /subversion/trunk/subversion/libsvn_client/conflicts.c
From:       stsp () apache ! org
Date:       2016-11-28 13:18:42
Message-ID: 20161128131843.270BD3A0254 () svn01-us-west ! apache ! org
[Download RAW message or body]

Author: stsp
Date: Mon Nov 28 13:18:42 2016
New Revision: 1771736

URL: http://svn.apache.org/viewvc?rev=1771736&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_merge_incoming_added_file_text_update): Convert local file to
   repository-normal form while copying it. Should fix merging with keywords.

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1771736&r1=1771735&r2=1771736&view=diff
 ==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Nov 28 13:18:42 2016
@@ -5323,9 +5323,11 @@ resolve_merge_incoming_added_file_text_u
   const char *working_file_tmp_abspath;
   svn_stream_t *working_file_stream;
   svn_stream_t *working_file_tmp_stream;
+  svn_stream_t *normalized_stream;
   apr_hash_t *working_props;
   apr_array_header_t *propdiffs;
   svn_error_t *err;
+  apr_hash_t *keywords;
 
   local_abspath = svn_client_conflict_get_local_abspath(conflict);
 
@@ -5341,7 +5343,13 @@ resolve_merge_incoming_added_file_text_u
   /* Copy the working file to temporary storage. */
   SVN_ERR(svn_stream_open_readonly(&working_file_stream, local_abspath,
                                    scratch_pool, scratch_pool));
-  SVN_ERR(svn_stream_copy3(working_file_stream, working_file_tmp_stream,
+  SVN_ERR(get_keywords(&keywords, ctx->wc_ctx, local_abspath,
+                       scratch_pool, scratch_pool));
+  normalized_stream = svn_subst_stream_translated(working_file_stream,
+                                                  "\n", TRUE,
+                                                  keywords, FALSE,
+                                                  scratch_pool);
+  SVN_ERR(svn_stream_copy3(normalized_stream, working_file_tmp_stream,
                            ctx->cancel_func, ctx->cancel_baton,
                            scratch_pool));
 


[prev in list] [next in list] [prev in thread] [next in thread]