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

Re: [PATCH] [merge-tracking] small logic fix.

From: Daniel Berlin <dberlin_at_dberlin.org>
Date: 2006-08-25 16:31:59 CEST

Kamesh Jayachandran wrote:
> Can someone look at this?

This is fine, i'll apply it.

>
> Kamesh Jayachandran wrote:
>> Hi All,
>>
>> Find the attached patch.
>>
>> With regards
>> Kamesh Jayachandran
>>
>> [[[
>> Patch by: Kamesh Jayachandran <kamesh@collab.net>
>>
>> set has_no_mergeinfo in case 'mergeinfo' has no corresponding records
>> in 'mergeinfo_changed' so that execution can take the path of 'count ==0'
>> block.
>>
>> * subversion/libsvn_fs_fs/tree.c
>> (get_merge_info_for_path):
>> set has_no_mergeinfo in case 'mergeinfo' has no corresponding records
>> in 'mergeinfo_changed'.
>> ]]]
>> ------------------------------------------------------------------------
>>
>> Index: subversion/libsvn_fs_fs/tree.c
>> ===================================================================
>> --- subversion/libsvn_fs_fs/tree.c (revision 21106)
>> +++ subversion/libsvn_fs_fs/tree.c (working copy)
>> @@ -1268,6 +1268,8 @@
>> apr_hash_set(result, path, APR_HASH_KEY_STRING, pathresult);
>> apr_hash_set(cache, path, APR_HASH_KEY_STRING, pathresult);
>> }
>> + else
>> + has_no_mergeinfo = TRUE;
>> }
>>
>> /* If this path has no mergeinfo, and we are asked to, check our parent */
>>
>>
>> ------------------------------------------------------------------------
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: dev-help@subversion.tigris.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 25 16:32:35 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.