svn commit: r1703919 - /subversion/trunk/subversion/libsvn_client/diff.c

[rh...@apache.org]

Author: rhuijben
Date: Fri Sep 18 21:41:58 2015
New Revision: 1703919

URL: http://svn.apache.org/viewvc?rev=1703919&view=rev
Log:
* subversion/libsvn_client/diff.c
  (display_prop_diffs): Don't use translation here as that would break
    applying property patches from generated diff files via svn patch.

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

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1703919&r1=1703918&r2=1703919&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Fri Sep 18 21:41:58 2015
@@ -496,12 +496,12 @@ display_prop_diffs(const apr_array_heade
     }
 
   SVN_ERR(svn_stream_printf_from_utf8(outstream, encoding, scratch_pool,
-                                      _("%sProperty changes on: %s%s"),
+                                      APR_EOL_STR
+                                      "Property changes on: %s"
                                       APR_EOL_STR,
                                       use_git_diff_format
                                             ? repos_relpath1
-                                            : index_path,
-                                      APR_EOL_STR));
+                                            : index_path));
 
   SVN_ERR(svn_stream_printf_from_utf8(outstream, encoding, scratch_pool,
                                       SVN_DIFF__UNDER_STRING APR_EOL_STR));
@@ -708,6 +708,8 @@ diff_content_changed(svn_boolean_t *wrot
                SVN_DIFF__EQUAL_STRING APR_EOL_STR,
                index_path));
 
+      *wrote_header = TRUE;
+
       /* ### Print git diff headers. */
 
       if (dwi->use_git_diff_format)