Julian Foad <julian.foad_at_wandisco.com> writes:
> Noorul Islam K M wrote:
>
>> Subject: Re: [PATCH] Fix for issue 3813
> [...]
>> [[[
>> Fix for issue 3813.
>> [...]
>> ]]]
>
> Hi Noorul. Please always include a brief description of the issue in
> the email subject line and in the log message. Anyone reading the text
> should be able to quickly know what it is talking about without having
> to fire up the issue tracker.
>
Please find the updated log message. Also attaching the patch again.
Log
[[[
Fix for issue 3813. Make 'svn diff' to use system temporary area instead
working copy admin area. Admin temporary area could be write protected
which makes 'svn diff' to fail in certain cases.
* subversion/libsvn_wc/diff_editor.c
(apply_textdelta): Use the default temporary directory instead of
admin temporary area to create temporary file.
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
]]]
Thanks and Regards
Noorul
Index: subversion/libsvn_wc/diff_editor.c
===================================================================
--- subversion/libsvn_wc/diff_editor.c (revision 1137953)
+++ subversion/libsvn_wc/diff_editor.c (working copy)
@@ -1518,7 +1518,6 @@
struct file_baton *fb = file_baton;
struct window_handler_baton *whb;
struct edit_baton *eb = fb->eb;
- const char *temp_dir;
svn_stream_t *source;
svn_stream_t *temp_stream;
@@ -1532,13 +1531,8 @@
- /* This is the file that will contain the pristine repository version. It
- is created in the admin temporary area. This file continues to exists
- until after the diff callback is run, at which point it is deleted. */
- SVN_ERR(svn_wc__db_temp_wcroot_tempdir(&temp_dir, eb->db, fb->local_abspath,
- pool, pool));
SVN_ERR(svn_stream_open_unique(&temp_stream, &fb->temp_file_path,
- temp_dir, svn_io_file_del_on_pool_cleanup,
+ NULL, svn_io_file_del_on_pool_cleanup,
fb->pool, fb->pool));
whb = apr_pcalloc(fb->pool, sizeof(*whb));
Received on 2011-06-22 13:13:01 CEST