Re: Special 1.5.x branch for issue2489 (SSL client certificate passphrase cache)

Alexander Thomas wrote:
> branches/1.5.x-issue2489 also requires r32376 merged from trunk. Without
> this change 'make javahl' fails.
>
> subversion/bindings/javahl/native/JNIUtil.cpp utilities
> svn_dso_initialize2() which came in r32376 committed by kameshj

Backported r32375:32379, r32394, r32396 for the above via r32579.

<snip>
$ svn merge -r 32375:32379 -c 32394 -c 32396
http://svn.collab.net/repos/svn/trunk .
--- Merging r32376 through r32379 into '.':
U subversion/libsvn_subr/cmdline.c
Conflict discovered in 'subversion/libsvn_subr/dso.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
         (mc) mine-conflict, (tc) theirs-conflict,
         (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
         (mc) mine-conflict, (tc) theirs-conflict,
         (s) show all options: r
U subversion/libsvn_subr/dso.c
U subversion/mod_dav_svn/mod_dav_svn.c
U subversion/include/svn_dso.h
--- Merging r32394 into '.':
G subversion/include/svn_dso.h
--- Merging r32396 into '.':
G subversion/include/svn_dso.h
U subversion/include/private/svn_dep_compat.h
</snip>

Thank You.

-- 
Senthil Kumaran S
http://www.stylesen.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org