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

Re: Confusing situation regarding revisions and changes

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2007-09-20 15:23:49 CEST

On 9/20/07, Mark Phippard <markphip@gmail.com> wrote:
> On 9/20/07, Erik Huelsmann <ehuels@gmail.com> wrote:
> > My mail was triggered by a mail (or IRC) thread which I have trouble
> > finding now.
>
> For the record, I raised this issue in the svn mergeinfo thread
> because I know you disagreed and I wanted to give you an opportunity
> to reply. You had mentioned on IRC that you did not remember seeing
> this issue discussed.

I know you started about the wording, yes. I wasn't talking about the
wording now, I'm talking about the conceptual difference between
-c40-45 and -r40:45. I'm not opposing mergetracking implementation
choices here now...

> > But we have never (until now) sent output to the user which looks like this:
> >
> > $ svn merge -r40:45 <some-url> .
> > Merging revisions 41 to 45
> >
> > (What happened to 40?!)
>
> Given the wording of the message, including 40 would be incorrect in
> my opinion. It could perhaps say:
>
> Merge revision range 40 to 45
>
> Or something to that effect to make it a little more clear.
>
> > This is why I say, "let's support -c 40-45" which would mean exactly
> > what people can find in the mergeinfo property *and* as the output
> > from the commandline client. That way, there's little room for
> > confusion, since we'll just start telling people to use -c with diff
> > and merge. -r is for looking at the nodes, -c for the edges, meaning
> > that -r makes sense for log, update, switch, copy etc. Just not for
> > diff, merge and mergetracking output.
>
> I am not against expanding the -c logic. As part of issue 2818, I'd
> like to see us support something like:

> -c 10-15, 18, 21-23, 30
>
> I don't see how that factors into this issue though. Are you saying
> you would want the merge output to vary based on whether -r or -c was
> used?

... No, I'd like to offer the user a way to talk to the tool the same
way the tool talks to the user. By which I mean: I think the -c option
needs to support X-Y starting 1.5. (And ofcourse, if you agree, I'll
have to put my actions where my mouth is.)

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 20 15:24:10 2007

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.