Author: rhuijben
Date: Sun May 30 16:43:49 2010
New Revision: 949530
URL: http://svn.apache.org/viewvc?rev=949530&view=rev
Log:
* subversion/libsvn_wc/merge.c
(detranslate_wc_file): Retrieve the eol style if the file is becoming binary
to avoid using uninitialized style when translating.
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=949530&r1=949529&r2=949530&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Sun May 30 16:43:49 2010
@@ -163,6 +163,8 @@ detranslate_wc_file(const char **detrans
SVN_ERR(svn_wc__get_keywords(&keywords, db, target_abspath, NULL,
scratch_pool, scratch_pool));
SVN_ERR(svn_wc__get_special(&special, db, target_abspath, scratch_pool));
+ SVN_ERR(svn_wc__get_eol_style(&style, &eol, db, target_abspath,
+ scratch_pool, scratch_pool));
}
else
{
