Hyrum,
This is effectively your r1231336, but on trunk. The
svn_delta_private.h will obviously merge cleanly, but you may have a
couple conflicts in compat.c. Then some manual clean-out in
svn_delta.h. But after that merge, your branch will be "closer" to
trunk.
There are some whitespace fixes to do in compat.c (which you also
skipped), but I figured it best to wait until after you merge... I'm
not *that* cruel :-P
Cheers,
-g
On Sun, Apr 22, 2012 at 19:35, <gstein_at_apache.org> wrote:
> Author: gstein
> Date: Sun Apr 22 23:35:14 2012
> New Revision: 1328998
>
> URL: http://svn.apache.org/viewvc?rev=1328998&view=rev
> Log:
> Similar to r1231336 (on the ev2-exports branch), make the individual
> shim functions non-static, but still private to svn devs.
>
> The branch does not have/use unlock_func (only found in trunk). This
> revision also semi-publicizes that typedef.
>
> This introduces a new, private header corresponding to svn_delta.h
>
> * subversion/include/private/svn_delta_private.h:
> (): new header
> (svn_delta__start_edit_func_t, svn_delta__target_revision_func_t,
> svn_delta__unlock_func_t, svn_delta__extra_baton,
> svn_delta__editor_from_delta, svn_delta__delta_from_editor): new
>
> * subversion/libsvn_delta/compat.c:
> (start_edit_func_t, target_revision_func_t, unlock_func_t,
> extra_baton): removed
> (ev2_edit_baton): update extra_baton and unlock_func types
> (delta_from_editor): renamed to ...
> (svn_delta__delta_from_editor): ... this. unlock and extra param
> types have been updated
> (editor_from_delta): renamed to ...
> (svn_delta__editor_from_delta): ... this. unlock and extra param
> types have been updated
> (svn_editor__insert_shims): update extra_baton and unlock_func types
>
> Added:
> subversion/trunk/subversion/include/private/svn_delta_private.h
> Modified:
> subversion/trunk/subversion/libsvn_delta/compat.c
>...
Received on 2012-04-23 01:40:12 CEST