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

Re: svn commit: r26894 - trunk/subversion/libsvn_client

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-10-03 19:28:42 CEST

On Tue, 02 Oct 2007, kameshj@tigris.org wrote:
...
> Code cleanup: Remove trivial helper function.
>
> * subversion/libsvn_client/merge.c
> (elide_target_mergeinfo): Remove, as the code it wraps is fairly trivial
> for callers to call directly.
> (discover_and_merge_children): Call 'svn_client__elide_mergeinfo' instead of
> 'elide_target_mergeinfo'.

The log message doesn't mention the removal of the conditional from
elide_target_mergeinfo(), instead saying something about that routine
being trivial. While completely true, it's a little confusing, since
it seems more likely that the conditional is simply no longer
necessary (e.g. perhaps it's already supplied by the caller?).

...
> --- trunk/subversion/libsvn_client/merge.c (original)
> +++ trunk/subversion/libsvn_client/merge.c Tue Oct 2 10:33:41 2007
> @@ -2076,23 +2076,6 @@
> return SVN_NO_ERROR;
> }
>
> -/* For all paths other than MERGE_B->target elide the mergeinfo. */
> -static svn_error_t *
> -elide_target_mergeinfo(const char *target_wcpath,
> - const svn_wc_entry_t *entry,
> - svn_wc_adm_access_t *adm_access,
> - struct merge_cmd_baton *merge_b,
> - apr_pool_t *pool)
> -{
> - if (!merge_b->dry_run && merge_b->operative_merge
> - && strcmp(target_wcpath, merge_b->target))
> - {
> - SVN_ERR(svn_client__elide_mergeinfo(target_wcpath,
> - merge_b->target, entry,
> - adm_access, merge_b->ctx, pool));
> - }
> - return SVN_NO_ERROR;
> -}
> /* URL1, URL2, and TARGET_WCPATH all better be directories. For the
> single file case, the caller does the merging manually.
>
> @@ -3339,8 +3322,9 @@
> *children_with_mergeinfo,
> i, iterpool));
> if (i > 0)
> - SVN_ERR(elide_target_mergeinfo(child->path, child_entry,
> - adm_access, merge_b, iterpool));
> + SVN_ERR(svn_client__elide_mergeinfo(child->path, merge_b->target,
> + child_entry, adm_access,
> + merge_b->ctx, iterpool));
> }
> }

  • application/pgp-signature attachment: stored
Received on Wed Oct 3 19:28:55 2007

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