On Wed, 2010-05-19, s...@apache.org wrote:
> Author: stsp
> Date: Wed May 19 13:55:51 2010
> New Revision: 946186
>
> URL: http://svn.apache.org/viewvc?rev=946186&view=rev
> * subversion/include/svn_wc.h
> (svn_wc_diff_callbacks4_t): Add new output parameter SKIP_CHILDREN
> to the dir_opened() callback. [...]
This new parameter also needs to be added to the wrap_4to3_dir_opened()
in 'deprecated.c'. ("subversion/libsvn_wc/deprecated.c:1672: warning:
initialization from incompatible pointer type")
- Julian
> Modified: subversion/trunk/subversion/include/svn_wc.h
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=946186&r1=946185&r2=946186&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/include/svn_wc.h (original)
> +++ subversion/trunk/subversion/include/svn_wc.h Wed May 19 13:55:51 2010
> @@ -2352,9 +2352,13 @@ typedef struct svn_wc_diff_callbacks4_t
> *
> * This function is called for @a path before any of the callbacks are
> * called for a child of @a path.
> + *
> + * If the callback returns @c TRUE in @a *skip_children, children
> + * of this directory will be skipped.
> */
> svn_error_t *(*dir_opened)(const char *local_dir_abspath,
> svn_boolean_t *tree_conflicted,
> + svn_boolean_t *skip_children,
> const char *path,
> svn_revnum_t rev,
> void *diff_baton,
>
> Modified: subversion/trunk/subversion/libsvn_client/diff.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=946186&r1=946185&r2=946186&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/diff.c (original)
> +++ subversion/trunk/subversion/libsvn_client/diff.c Wed May 19 13:55:51 2010
> @@ -800,6 +800,7 @@ diff_dir_deleted(const char *local_dir_a
> static svn_error_t *
> diff_dir_opened(const char *local_dir_abspath,
> svn_boolean_t *tree_conflicted,
> + svn_boolean_t *skip_children,
> const char *path,
> svn_revnum_t rev,
> void *diff_baton,
> @@ -807,6 +808,8 @@ diff_dir_opened(const char *local_dir_ab
> {
> if (tree_conflicted)
> *tree_conflicted = FALSE;
> + if (skip_children)
> + *skip_children = FALSE;
>
> /* Do nothing. */
>
