On Thu, Jun 28, 2012 at 9:49 AM, <[email protected]> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Jun 28 13:49:35 2012
>...
> +static svn_error_t *
> +conflict__get_conflict(svn_skel_t **conflict,
> + svn_skel_t *conflict_skel,
> + const char *conflict_type)
> +{
> + svn_skel_t *c;
> + apr_size_t len;
> + SVN_ERR_ASSERT(conflict_skel
> + && conflict_skel->children
> + && conflict_skel->children->next
> + && !conflict_skel->children->next->is_atom);
> +
> + len = strlen(conflict_type);
> +
> + for(c = conflict_skel->children->next->children;
> + c;
> + c = c->next)
> + {
> + if (c->children->is_atom
> + && c->children->len == len
> + && memcmp(c->children->data, conflict_type, len) == 0)
Please use svn_skel__matches_atom() for clarity.
>...
> + markers = svn_skel__make_empty_list(result_pool);
> +
> + if (marker_abspath)
> + {
> + const char *marker_relpath;
> + SVN_ERR(svn_wc__db_to_relpath(&marker_relpath, db, wri_abspath,
> + marker_abspath,
> + result_pool, scratch_pool));
> +
> + svn_skel__prepend_str(marker_relpath, markers, result_pool);
> + }
> + else
> + svn_skel__prepend(svn_skel__make_empty_list(result_pool), markers);
> +
> + svn_skel__prepend(markers, prop_conflict);
If there is no MARKER_ABSPATH, then you end up with (()) rather than just ().
>...
Cheers,
-g
