Make 'svn patch' ignore "\ No newline at end of file" marker lines. They were interpreted as context and caused text conflicts.
Make 'svn patch' ignore "\ No newline at end of file" marker lines.
They were interpreted as context and caused text conflicts.

An open question is whether 'svn patch' should do something smart
in the presence of such lines. Currently, applying a patch which only
changes the last character of a file to a newline is a no-op, even if
the target file does not end with a newline. However, this behaviour is
encoded somewhere within svn_wc_merge4(), rather than the 'svn patch' code.

* subversion/libsvn_diff/parse-diff.c
  (original_line_filter, modified_line_filter): Filter "\ No newline at
   end of file" lines.
  (parse_next_hunk): Disregard "\ No newline at end of file" lines.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion