From 8a3e5f3399b9385851ffdde0e4ff5336acaaf84b Mon Sep 17 00:00:00 2001 From: glasser Date: Tue, 22 Apr 2008 19:15:29 +0000 Subject: [PATCH] Allow 'svn merge' to merge diffs which add 'svn:eol-style' properties to files that used to have inconsistent newlines. Specifically, if the diff being applied adds an 'svn:eol-style' property to a file, then the left file gets converted to the new EOL style before running diff3. If that left file (ie, an old repository file) had inconsistent newlines, then svn errored out with a useless "svn: File '/tmp/tmp' has inconsistent newlines", and there was basically no recourse. So let it repair newlines. * subversion/libsvn_wc/merge.c (maybe_update_target_eols): Repair newlines when translating 'left' file in a merge. git-svn-id: http://svn.collab.net/repos/svn/trunk@30756 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a --- subversion/libsvn_wc/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subversion/libsvn_wc/merge.c b/subversion/libsvn_wc/merge.c index 0379ba3da..2989417c6 100644 --- a/subversion/libsvn_wc/merge.c +++ b/subversion/libsvn_wc/merge.c @@ -245,7 +245,7 @@ maybe_update_target_eols(const char **new_target, pool)); SVN_ERR(svn_subst_copy_and_translate3(old_target, tmp_new, - eol, eol ? FALSE : TRUE, + eol, TRUE, NULL, FALSE, FALSE, pool)); *new_target = tmp_new; -- 2.11.4.GIT