btw, this breaks the JavaHL bindings
On Mon, May 3, 2010 at 18:01, <dannas_at_apache.org> wrote:
> Author: dannas
> Date: Mon May 3 22:01:53 2010
> New Revision: 940651
>
> URL: http://svn.apache.org/viewvc?rev=940651&view=rev
> Log:
> Remove field 'tree_conflict' from svn_wc_status3_t and replace the uses
> of it with status->conflicted.
>
> * subversion/include/svn_wc.h
> (svn_wc_status3_t): Remove field 'tree_conflict'.
>
> * subversion/libsvn_wc/util.c
> (svn_wc__status2_from_3): Initialize the tree_conflict field for
> svn_wc_status2_t.
>
> * subversion/libsvn_wc/status.c
> (assemble_status): Remove initializations for status->tree_conflict.
> (send_unversioned_item,
> svn_wc__is_sendable_status): Replace status->tree_conflict with
> status->conflicted. Safe to do since we're checking unversioned items
> to be returned and there can't be any other kind of conflict on an
> unversioned path.
> (svn_wc_dup_status3): Don't duplicate status->tree_conflict
>
> Modified:
> subversion/trunk/subversion/include/svn_wc.h
> subversion/trunk/subversion/libsvn_wc/status.c
> subversion/trunk/subversion/libsvn_wc/util.c
>
>...
Received on 2010-05-04 02:42:54 CEST