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

On Mon, 23 Apr 2007, pburba@tigris.org wrote:
...
> --- trunk/subversion/libsvn_client/switch.c (original)
> +++ trunk/subversion/libsvn_client/switch.c Mon Apr 23 14:06:41 2007
> @@ -202,13 +202,16 @@
> effectively doing a right-left post-order traversal. */
> for (i = children_with_mergeinfo->nelts -1; i >= 0; i--)
> {
> + const svn_wc_entry_t *child_entry;
> const char *child_wcpath;
> svn_sort__item_t *item =
> &APR_ARRAY_IDX(children_with_mergeinfo, i,
> svn_sort__item_t);
> child_wcpath = item->key;
> + SVN_ERR(svn_wc_entry(&child_entry, child_wcpath,
> + adm_access, FALSE, pool));

Should we be using svn_wc__entry_versioned() here instead, to assure
that we get a non-NULL child_entry?

> SVN_ERR(svn_client__elide_mergeinfo(child_wcpath, NULL,
> - entry, adm_access, ctx,
> + child_entry, adm_access, ctx,
> pool));
> }
...
> --- trunk/subversion/libsvn_client/update.c (original)
> +++ trunk/subversion/libsvn_client/update.c Mon Apr 23 14:06:41 2007
> @@ -287,12 +287,15 @@
> effectively doing a right-left post-order traversal. */
> for (i = children_with_mergeinfo->nelts -1; i >= 0; i--)
> {
> + const svn_wc_entry_t *child_entry;
> const char *child_wcpath;
> svn_sort__item_t *item = &APR_ARRAY_IDX(children_with_mergeinfo,
> i,
> svn_sort__item_t);
> child_wcpath = item->key;
> - SVN_ERR(svn_client__elide_mergeinfo(child_wcpath, NULL, entry,
> + SVN_ERR(svn_wc_entry(&child_entry, child_wcpath,
> + adm_access, FALSE, pool));

Ditto.

> + SVN_ERR(svn_client__elide_mergeinfo(child_wcpath, NULL, child_entry,
> adm_access, ctx, pool));
> }
...