Thanks Dan. Corrected.
With regards
Kamesh Jayachandran
Daniel Rall wrote:
> On Mon, 17 Sep 2007, kameshj@tigris.org wrote:
> ...
>
>> Code refactor: Handle no-ops early.
>>
>
> "earlier"?
>
>
>> * subversion/libsvn_client/merge.c
>> (do_merge, do_single_file_merge): Removing no-op check.
>>
>
> "Remove", rather than "removing".
>
>
>> (svn_client_merge3, svn_client_merge_peg3):
>> Return for no-op merge early.
>>
>
> "earlier"?
>
>> Modified:
>> trunk/subversion/libsvn_client/merge.c
>>
>> Modified: trunk/subversion/libsvn_client/merge.c
>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/merge.c?pathrev=26634&r1=26633&r2=26634
>> ==============================================================================
>> --- trunk/subversion/libsvn_client/merge.c (original)
>> +++ trunk/subversion/libsvn_client/merge.c Mon Sep 17 07:48:09 2007
>> @@ -2411,13 +2411,6 @@
>> ((depth == svn_depth_infinity) ||
>> (depth == svn_depth_immediates)));
>>
>> - if (merge_type == merge_type_no_op)
>> - return SVN_NO_ERROR;
>> -
>> - if (merge_b->record_only && merge_b->dry_run)
>> - return SVN_NO_ERROR;
>> -
>> -
>> if (notify_b.same_urls && merge_b->same_repos)
>> {
>> /* Reparent ra_session to WC target url. */
>> @@ -2854,12 +2847,6 @@
>> range.inheritable = TRUE;
>> if (notify_b.same_urls && merge_b->same_repos)
>> {
>> - if (merge_type == merge_type_no_op)
>> - return SVN_NO_ERROR;
>> -
>> - if (merge_b->record_only && merge_b->dry_run)
>> - return SVN_NO_ERROR;
>> -
>> /* Reparent ra_session1 to WC target url. */
>> SVN_ERR(svn_ra_reparent(ra_session1, entry->url, pool));
>>
>> @@ -4001,6 +3988,9 @@
>> SVN_ERR(grok_range_info_from_opt_revisions(&range, &merge_type, same_urls,
>> ra_session1, revision1,
>> ra_session2, revision2, pool));
>> +
>> + if ((merge_type == merge_type_no_op) || (record_only && dry_run))
>> + return SVN_NO_ERROR;
>> }
>>
>> /* If our target_wcpath is a single file, assume that the merge
>> @@ -4239,6 +4229,9 @@
>> SVN_ERR(grok_range_info_from_opt_revisions(&range, &merge_type, TRUE,
>> ra_session, rev1, ra_session,
>> rev2, pool));
>> +
>> + if ((merge_type == merge_type_no_op) || (record_only && dry_run))
>> + return SVN_NO_ERROR;
>> }
>>
>> /* If our target_wcpath is a single file, assume that the merge
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: svn-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 Tue Sep 18 08:41:16 2007