[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

New merge APIs review, and JavaHL

From: Branko Čibej <brane_at_wandisco.com>
Date: Thu, 21 Mar 2013 06:16:15 +0100


This is pretty much the last open issue I have with the JavaHL upgrade
to our new APIs.

There are two revised merge APIs:


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
Received on 2013-03-21 06:16:57 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.