Re: New merge APIs review, and JavaHL
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 21 Mar 2013 12:49:56 +0000 (GMT)
Branko Čibej wrote:
> There are two revised merge APIs:
The automatic merge API *only* performs merge-tracking merges that are 'complete' (that take all source revisions up to rX). If you want to do a non-tracking merge, or a merge-tracking cherry-pick merge, then _merge(_peg) is what you need.
> svn_client_merge_reintegrate should be deprecated.
I would suggest yes. In general, I would suggest the Java API should track the C API unless there is a good reason not to.
Put another way, if we think the C API for merging is confusing / bloated / whatever, then we should address it there -- in the C API -- and then track the changes in the bindings.
For example, it might perhaps be reasonable to remove the merge-tracking support in the new revision of svn_client_merge5(), becaue that function is for performing a 2-URL merge and the automatic merge should replace the only really useful use case for that (which is the reintegrate use case).
> Regarding the latter, I'm given to understand that we will still have to
I agree with that principle, whether we consider the all-revs-are-merged-except-for-some-no-ops case to be extreme or not.
This is an archived mail posted to the Subversion Dev mailing list.