svn commit: r1570669 - /subversion/trunk/subversion/libsvn_diff/diff_file.c

[br...@apache.org]

Author: breser
Date: Fri Feb 21 19:10:40 2014
New Revision: 1570669

URL: http://svn.apache.org/r1570669
Log:
* subversion/libsvn_diff/diff_file.c
  (output_conflict_with_context): Move the output_marker_eol() call from ...
  (output_conflict_with_context_marker): to here.

Modified:
    subversion/trunk/subversion/libsvn_diff/diff_file.c

Modified: subversion/trunk/subversion/libsvn_diff/diff_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff_file.c?rev=1570669&r1=1570668&r2=1570669&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff_file.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff_file.c Fri Feb 21 19:10:40 2014
@@ -2209,6 +2209,8 @@ output_conflict_with_context_marker(svn_
                               "%s (%" APR_OFF_T_FMT ",%" APR_OFF_T_FMT ")",
                               label, start + 1, length));
 
+  SVN_ERR(output_marker_eol(btn));
+
   return SVN_NO_ERROR;
 }
 
@@ -2236,12 +2238,10 @@ output_conflict_with_context(svn_diff3__
   /* Output the conflict itself. */
   SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_modified,
                                               modified_start, modified_length));
-  SVN_ERR(output_marker_eol(btn));
   SVN_ERR(output_hunk(btn, 1/*modified*/, modified_start, modified_length));
 
   SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_original,
                                               original_start, original_length));
-  SVN_ERR(output_marker_eol(btn));
   SVN_ERR(output_hunk(btn, 0/*original*/, original_start, original_length));
 
   SVN_ERR(svn_stream_printf(btn->output_stream, btn->pool,
@@ -2249,7 +2249,6 @@ output_conflict_with_context(svn_diff3__
   SVN_ERR(output_hunk(btn, 2/*latest*/, latest_start, latest_length));
   SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_latest,
                                               latest_start, latest_length));
-  SVN_ERR(output_marker_eol(btn));
 
   /* Go into print-trailing-context mode instead. */
   make_trailing_context_printer(btn);