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

Re: Subversion 1.5 issues blocking RC1

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 07 Apr 2008 12:24:57 +0100

Mark Phippard wrote:
> On Mon, Apr 7, 2008 at 6:14 AM, Karl Fogel <kfogel_at_red-bean.com> wrote:
>>"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().
> The scenario David presented was that a user uses merge --reintegrate,
> it passes all of its checks and gets into the do_merge() API but then
> errors our with a message that suggests the user try the --force
> option. This leaves us with a couple options:
> 1) Change the error message. This is probably impossible since the
> API is being reused here.
> 2) Change --reintegrate so that it accepts the --force option AND
> passes it along to the right API. If we do not do the latter, then
> the user could specify --force AND still get the error message, which
> would be just as confusing.
> I have not looked at your commit yet.

Mark, Karl's r30392 log message indicates that he has done the right thing:
avoided suggesting "--force" in the error message in that case.

- Julian

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 13:25:14 CEST

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.