You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/02/17 19:10:29 UTC
svn commit: r1569066 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_client/diff.c
Author: breser
Date: Mon Feb 17 18:10:28 2014
New Revision: 1569066
URL: http://svn.apache.org/r1569066
Log:
Merge the 1.7.x-diff-translate branch:
* ^/subversion/branches/1.7.x-diff-translate
Fix regression found in 1.7.15 on Windows.
Justification:
We really should be doing translations right on all platforms.
Votes:
+1: breser, rhuijben, danielsh
+0: ivan (tested, but I don't have enough knowledge about this code for
proper review)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/diff.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x-diff-translate:r1568403-1569065
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1569066&r1=1569065&r2=1569066&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Feb 17 18:10:28 2014
@@ -119,13 +119,3 @@ Veto-blocked changes:
-1: stsp (not a bug fix, changes output in a patch release)
Approved changes:
-=================
-
- * ^/subversion/branches/1.7.x-diff-translate
- Fix regression found in 1.7.15 on Windows.
- Justification:
- We really should be doing translations right on all platforms.
- Votes:
- +1: breser, rhuijben, danielsh
- +0: ivan (tested, but I don't have enough knowledge about this code for
- proper review)
Modified: subversion/branches/1.7.x/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/diff.c?rev=1569066&r1=1569065&r2=1569066&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/diff.c Mon Feb 17 18:10:28 2014
@@ -2317,6 +2317,12 @@ diff_repos_wc_file_target(const char *ta
svn_stream_t *working_content;
svn_stream_t *normalized_content;
+ if (eol_style == svn_subst_eol_style_native)
+ eol_str = SVN_SUBST_NATIVE_EOL_STR;
+ else if (! (eol_style == svn_subst_eol_style_fixed
+ || eol_style == svn_subst_eol_style_none))
+ return svn_error_create(SVN_ERR_IO_UNKNOWN_EOL, NULL, NULL);
+
SVN_ERR(svn_stream_open_readonly(&working_content, file2_abspath,
scratch_pool, scratch_pool));
@@ -2326,7 +2332,8 @@ diff_repos_wc_file_target(const char *ta
scratch_pool, scratch_pool));
normalized_content = svn_subst_stream_translated(
file2_content, eol_str,
- TRUE, keywords, FALSE, scratch_pool);
+ eol_style == svn_subst_eol_style_fixed,
+ keywords, FALSE, scratch_pool);
SVN_ERR(svn_stream_copy3(working_content, normalized_content,
ctx->cancel_func, ctx->cancel_baton,
scratch_pool));