sbutler_at_tigris.org wrote:
> Author: sbutler
> Date: Wed Nov 19 13:26:59 2008
> New Revision: 34273
>
> Log:
> Changing existing tree-conflict data functions for use in fixing
> issue 3328 "Update can't record >1 add/edit tree conflict per dir".
>
> The functions should read and write strings instead of entries.
> When running logs, it's kind of silly to make dummy entries just
> to hold the tc-data strings.
Nice change!
> @@ -576,8 +577,9 @@ svn_wc__loggy_del_tree_conflict(svn_stri
> }
>
> /* Rewrite the entry. */
> - SVN_ERR(svn_wc__write_tree_conflicts_to_entry(conflicts, &tmp_entry,
> - pool));
> + SVN_ERR(svn_wc__write_tree_conflicts(&conflict_data, conflicts, pool));
> + tmp_entry.tree_conflict_data = apr_pstrdup(pool, conflict_data);
> +
Why don't you make it:
SVN_ERR(svn_wc__write_tree_conflicts(&(tmp_entry.tree_conflict_data),
?
> @@ -619,7 +622,9 @@ svn_wc__loggy_add_tree_conflict(svn_stri
>
> APR_ARRAY_PUSH(conflicts, const svn_wc_conflict_description_t *) = conflict;
>
> - SVN_ERR(svn_wc__write_tree_conflicts_to_entry(conflicts, &tmp_entry, pool));
> + SVN_ERR(svn_wc__write_tree_conflicts(&conflict_data, conflicts, pool));
> + tmp_entry.tree_conflict_data = apr_pstrdup(pool, conflict_data);
> +
(another one)
Nice going.
~Neels
Received on 2008-11-20 06:24:36 CET