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

Re: [PATCH] Fix merging with broken softlink as target

From: David O'Shea <david.oshea_at_s3group.com>
Date: Tue, 06 May 2008 09:42:29 +0100

On 06/05/2008 01:13, Karl Fogel wrote:
> "David O'Shea" <david.oshea_at_s3group.com> writes:
>> Index: subversion/libsvn_wc/merge.c
>> ===================================================================
>> --- subversion/libsvn_wc/merge.c (revision 31014)
>> +++ subversion/libsvn_wc/merge.c (working copy)
>> @@ -656,7 +656,10 @@
>> {
>> svn_boolean_t same;
>> SVN_ERR(svn_io_files_contents_same_p(&same, result_target,
>> - merge_target, pool));
>> + (is_binary ?
>> + merge_target :
>> + tmp_target),
>> + pool));
>>
>> *merge_outcome = same ? svn_wc_merge_unchanged : svn_wc_merge_merged;
>> }
>
> I've looked at the context around this change, and I'm still not seeing
> the connection between is_binary and broken symbolic links. That's more
> a statement about my ignorance than about your patch -- after all, you
> did fix the bug! -- but if you could go into more detail about exactly
> how this fixes the problem, that would be great. (Putting the
> explanation in a comment in the code might be best, in fact.)

Sure - I don't have the trunk checked out here, but will add a comment
and post a new patch this evening. However, basically the file is only
translated if it's not binary (i.e. !is_binary implies tmp_target exists
and contains the repository normalised version of merge_target, created
near the start of the same function).

David.

-- 
The information contained in this e-mail and in any attachments is confidential and is designated solely for the attention of the intended recipient(s). If you are not an intended recipient, you must not use, disclose, copy, distribute or retain this e-mail or any part thereof. If you have received this e-mail in error, please notify the sender by return e-mail and delete all copies of this e-mail from your computer system(s).
Please direct any additional queries to: communications_at_s3group.com.
Thank You.
Silicon and Software Systems Limited. Registered in Ireland no. 378073.
Registered Office: South County Business Park, Leopardstown, Dublin 18
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-06 10:42:53 CEST

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