On Tue, Oct 21, 2008 at 7:18 PM, <hwright_at_tigris.org> wrote:
>...
> +++ trunk/subversion/libsvn_wc/props.c Tue Oct 21 19:18:36 2008 (r33831)
> @@ -1318,18 +1318,14 @@ maybe_generate_propconflict(svn_boolean_
>
> if (working_val && new_val)
> {
> - apr_file_t *merged_file;
> svn_stream_t *mergestream;
> svn_diff_t *diff;
> svn_diff_file_options_t *options =
> svn_diff_file_options_create(filepool);
>
> - SVN_ERR(svn_io_open_unique_file2(&merged_file, &cdesc->merged_file,
> - path, ".tmp",
> - svn_io_file_del_on_pool_cleanup,
> - filepool));
> - mergestream = svn_stream_from_aprfile2(merged_file, FALSE,
> - filepool);
> + SVN_ERR(svn_stream_open_unique(&mergestream, &cdesc->merged_file,
> + path, svn_io_file_del_on_pool_cleanup,
> + filepool, pool));
Woah. You sure that PATH is a directory? Otherwise, the above code
isn't going to work.
svn_stream_open_unique() takes a directory path and creates a child in
that directory. svn_io_open_unique_file2() takes a file path, and
creates a sibling.
Cheers,
-g
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-22 05:12:59 CEST