You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/09/04 19:27:55 UTC

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

On Fri, Sep 4, 2009 at 11:58, Hyrum K. Wright<hy...@hyrumwright.org> wrote:
>...
> @@ -241,7 +241,7 @@ bail_on_tree_conflicted_children(const c
>     return SVN_NO_ERROR;
>
>   SVN_ERR(svn_wc__read_tree_conflicts(&conflicts, entry->tree_conflict_data,
> -                                      path, pool));
> +                                      local_abspath, pool));

Normally, a CONFLICTS hash is keyed by relative paths, not abspaths.
In this particular case, you're only going to scan the values, but
this change doesn't follow precedent.

>...

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2391091