Author: danielsh
Date: Wed Jan 18 17:48:47 2012
New Revision: 1232970
URL: http://svn.apache.org/viewvc?rev=1232970&view=rev
Log:
On the ev2-export branch: don't expand newlines for special files, either.
* subversion/libsvn_client/export.c
(add_file): As above.
Modified:
subversion/branches/ev2-export/subversion/libsvn_client/export.c
Modified: subversion/branches/ev2-export/subversion/libsvn_client/export.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/export.c?rev=1232970&r1=1232969&r2=1232970&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/export.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/export.c Wed Jan 18
17:48:47 2012
@@ -756,7 +756,7 @@ add_file(void *baton,
special = TRUE;
/* Possibly wrap the stream to be translated, as dictated by the props. */
- if (eol_style_val || keywords_val)
+ if ((eol_style_val || keywords_val) && !special)
{
svn_subst_eol_style_t style;
const char *eol = NULL;
@@ -770,7 +770,7 @@ add_file(void *baton,
repair = TRUE;
}
- if (keywords_val && !special)
+ if (keywords_val)
SVN_ERR(svn_subst_build_keywords2(&final_kw, keywords_val->data,
revision, full_url, date,
author, scratch_pool));
