Morning!
This is pretty much the last open issue I have with the JavaHL upgrade
to our new APIs.
There are two revised merge APIs:
svn_client_merge5
svn_client_merge_peg5
and also a whole new group of svn_client_automatic_merge_ APIs, and the
(not revised) svn_client_merge_reintegrate. I'm in a dilemma as to which
of these APIs to use in JavaHL; and I'm also wondering if
svn_client_merge(_peg)5 should even exist, given the new automatic
variants are supposed do supersede them, and whether
svn_client_merge_reintegrate should be deprecated.
Regarding the latter, I'm given to understand that we will still have to
use svn_client_merge_reintegrate in some -- extreme? -- cases, but IMO,
it would be more correct to deprecate now even if the automatic merge
doesn't cover all edge cases yet.
-- Brane
--
Branko Čibej
Director of Subversion | WANdisco | www.wandisco.com
