[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r28561 - in branches/issue-2897/subversion: libsvn_client tests/cmdline

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Fri, 11 Jan 2008 20:37:08 +0530

David Glasser wrote:
> One more thing!
>
>> + SVN_ERR(svn_diff_file_output_merge(ostream, diff,
>> + left, older, right,
>> + left_marker,
>> + target_marker,
>> + right_marker,
>> + "=======", /* seperator */
>> + FALSE, /* display original */
>> + FALSE, /* resolve conflicts */
>> + subpool));
>> + SVN_ERR(svn_stream_close(ostream));
>> + SVN_ERR(svn_io_file_flush_to_disk(result_f, subpool));
>> +
>> + SVN_ERR(svn_io_copy_file(result_target, older, TRUE, subpool));
>> + }
>> + svn_pool_destroy(subpool);
>> + return SVN_NO_ERROR;
>> +}
>>
>
> Shouldn't this function do different things for binary and text files?
>

In fact we should not 'extract non-reflective changes from a reflective
revision' for binary file.

Fixed in r28868.

> Also I feel like there should be some concept of subst in there
> somewhere. Maybe it should just be using something along the lines of
> svn_wc__merge_internal?
>
> --dave
>
>
>

You mean some kind of detranslation?
I don't think that is needed as files retrieved via 'svn_ra_get_file'
does not have any keywords expanded
and OLDER also does not have keyword expanded.

Thanks

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-11 16:07:31 CET

This is an archived mail posted to the Subversion Dev mailing list.