Michael Schlottke <[email protected]> writes:
> However, for now I'd prefer a quick-n-dirty solution rather than not
> being able to upgrade at all. I know this is asking for quite
> something, especially since I don't know how to do it myself :-/
Here's my really quick-n-dirty patch used during investigation. It's
not going to be committed. If it breaks you get to keep the pieces:
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 1494268)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -816,13 +816,18 @@ diff_content_changed(svn_boolean_t *wrote_header,
svn_io_file_del_on_pool_cleanup,
scratch_pool, scratch_pool));
+ {
+ apr_file_t *stdout_file;
+ apr_file_open_stdout(&stdout_file, scratch_pool);
+
SVN_ERR(svn_io_run_diff2(".",
diff_cmd_baton->options.for_external.argv,
diff_cmd_baton->options.for_external.argc,
label1, label2,
tmpfile1, tmpfile2,
- &exitcode, outfile, errfile,
+ &exitcode, stdout_file, errfile,
diff_cmd_baton->diff_cmd, scratch_pool));
+ }
SVN_ERR(svn_io_file_close(outfile, scratch_pool));
SVN_ERR(svn_io_file_close(errfile, scratch_pool));
--
Philip Martin | Subversion Committer
WANdisco | Non-Stop Data
www.wandisco.com
