"Mark Phippard" <markphip_at_gmail.com> writes:
> 3) Reintegrate bugs. David Glasser pointed out a couple of small bugs
> that need to be fixed when using reintegrate.
> http://svn.haxx.se/dev/archive-2008-04/0291.shtml
> I think we probably need to put the --force option back into the API
> so that it can pass it along to the merge API it eventually calls.
>
> Julian, since you removed force, could you look at these?
I've got changes that take care of the two issues mentioned in that
mail; as soon as they pass 'make check' I'll commit.
Regarding putting 'force' back in svn_client_merge_reintegrate():
Background: the revision where Julian removed it was r29634 (which was
backported to 1.5.x). The log message says 'force' was removed because
it was "redundant" -- not sure that's the right word; I think rather it
was removed because forcing was inconsistent with reintegration as we've
currently defined it (but could be compatible in the future).
We could it back into svn_client_merge_reintegrate(), document for now
that it's meaningless, and that callers should pass FALSE (and we could
enforce that). I guess it would be within our release/API guidelines to
give 'force' a meaning in 1.5.1.
Mark, were you proposing that, or were you proposing actually passing it
along to merge_cousins_and_supplement_mergeinfo() right now? That's the
only merge API called, and it just passes along to do_merge().
I'm totally comfortable with the first route, to save us API churn. I'm
not sure that actually passing it along now would be good though, since
we're not quite sure what we'd be forcing.
(This is all somewhat independent of your item (4), "reintegrate
overhaul"...)
> 4) Reintegrate "overhaul". David Glasser also has proposed some
> significant changes to the API.
> http://svn.haxx.se/dev/archive-2008-04/0288.shtml
> Given that there is no one available to code these changes, I am in
> favor of punting this to 1.6.
>
> Comments?
In favor of punting it solely because it's much more important to get
1.5.0 out now (same as you :-) ). However, I'd be comfortable releasing
1.6 even if --reintegrate improvements are the only major new thing in
it. In other words, the amount of time users wait for this overhaul
need not be greatly affected by whether the changes are in 1.5 or not.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-07 12:15:11 CEST