[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: David Glasser <glasser_at_davidglasser.net>
Date: Mon, 7 Apr 2008 07:39:10 -0700

On Mon, Apr 7, 2008 at 5:19 AM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> Julian Foad <julianfoad_at_btopenworld.com> writes:
> > Mark Phippard wrote:
> >> 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.
> However, this still leaves the question of whether we want the API to
> take a 'force' parameter, because we have a plan to make it meaningful
> later, and this way could do so in 1.5.x rather than 1.6.
> If we know a scenario in which 'svn merge --reintegrate --force' would
> be useful, then I can easily make that change. The parameter would be
> ignored right now, and in 1.5.0 combining those options would still
> cause an error, but 1.5.1 could do something different.
> I don't know of such a scenario, though. Does anyone?

I could imagine using --reintegrate --force to mean "yes, I know that
the branch has descendants with different mergeinfo, but I want to
merge anyway". On the other hand, I think it would be reasonable for
that logic to be in the client, not the API (see the partial patch I
posted over the weekend).


David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
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 16:39:21 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.