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/13 04:43:03 UTC
Re: svn commit: r39259 - in trunk/subversion: include/private
libsvn_client libsvn_wc
On Sat, Sep 12, 2009 at 17:19, Hyrum K. Wright <hy...@hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_client/merge.c Sat Sep 12 14:19:50 2009 (r39259)
> @@ -9021,8 +9021,6 @@ svn_client_merge_reintegrate(const char
> svn_mergeinfo_t unmerged_to_source_mergeinfo_catalog;
> svn_boolean_t use_sleep = FALSE;
> svn_error_t *err;
> - static const svn_wc__node_walk_callbacks_t walk_callbacks =
> - { get_subtree_mergeinfo_walk_cb, get_mergeinfo_error_handler };
You may want to write some code to ignore errors, per
get_mergeinfo_error_handler.
>...
> +++ trunk/subversion/libsvn_wc/update_editor.c Sat Sep 12 14:19:50 2009 (r39259)
>...
> @@ -1496,7 +1494,7 @@ tree_has_local_mods(svn_boolean_t *modif
>
> SVN_ERR(svn_wc__internal_walk_children(db, local_abspath,
> FALSE /* show_hidden */,
> - &modcheck_callbacks, &modcheck_baton,
> + &modcheck_found_node, &modcheck_baton,
"&" is not needed for the function.
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2394166
Re: svn commit: r39259 - in trunk/subversion: include/private
libsvn_client libsvn_wc
Posted by "Hyrum K. Wright" <hy...@hyrumwright.org>.
On Sep 12, 2009, at 11:43 PM, Greg Stein wrote:
> On Sat, Sep 12, 2009 at 17:19, Hyrum K. Wright
> <hy...@hyrumwright.org> wrote:
>> ...
>> +++ trunk/subversion/libsvn_wc/update_editor.c Sat Sep 12 14:19:50
>> 2009 (r39259)
>> ...
>> @@ -1496,7 +1494,7 @@ tree_has_local_mods(svn_boolean_t *modif
>>
>> SVN_ERR(svn_wc__internal_walk_children(db, local_abspath,
>> FALSE /* show_hidden */,
>> - &modcheck_callbacks,
>> &modcheck_baton,
>> + &modcheck_found_node,
>> &modcheck_baton,
>
> "&" is not needed for the function.
r39321.
-Hyrum
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2394853