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

Re: Add -c option to merge

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-10-27 21:48:39 CEST

Daniel Berlin wrote:
> On Thu, 2005-10-27 at 14:05 +0100, Julian Foad wrote:
>>>r17054 | dberlin | 2005-10-27 00:42:52 +0100 (Thu, 27 Oct 2005) | 14 lines
>>> Add a -c option to merge and diff.
>>Please describe here what feature has been added, not just what option letter
>>is used to invoke it.
> I had it before (It used to say "Add -c option to merge and diff that
> represents change number"), and somebody told me on IRC *not to do
> that*, so i removed it.

Huh? Who said, what, exactly?

Surely it's obvious that describing a new feature as "a -c option" is not
helpful except to those who already know what it is.

"that represents change number" is a bit too cryptic given that we haven't
explicitly used the concept of "a change number" before, but it's better than

If you want my suggestion, it should mention both '-c' and '--change', say what
these options are for, and try to indicate why we believe this would be wanted.
  Something like:

   Add to 'diff' and 'merge' a '-c'/'--change' option to specify a single
   change conveniently by its revision number. Inspired by SVK's '-c' option.
   '-c M' is shorthand for '-r M-1:M'.

(I have been led to believe that SVK was the inspiration for this idea; if I'm
wrong, omit or change that sentence.)

> <snip>
> I've attached a short followup to fix all these.
> Does it address all your concerns?

Nearly. You missed this one:
> " 3. merge [-c M |-r N:M] SOURCE[@REV] [WCPATH]\n"

Missing space after "|".

> I've already modified the revision log to specify the test names, and
> fix the table name.

Thanks. I've just edited it to correct a typo in one of the test names and
remove extra leading spaces.

> [[[

Brief description: something like "Make '-c' reject a negative argument, and
make minor improvements to help and error messages, as a follow-up to r17054."

> * subversion/client/cmdline/main.c
> (svn_cl__options): Start description of 'c' with lowercase, and
> explain argument better.
> (main): Say which argument non-numeric change was given to.
> Error out on negative revision number to -c.

OK, those are all good.

> Correct typo and spacing in error for -r.

Huh? You already fixed that last line in r17056. <checking...> I beg your
pardon; David James did so, not you. Anyway, it's done.

- Julian

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 27 21:50:14 2005

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.