[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: Daniel Berlin <dberlin_at_dberlin.org>
Date: 2005-10-27 15:33:54 CEST

On Thu, 2005-10-27 at 14:05 +0100, Julian Foad wrote:
> Daniel Berlin wrote:
> > On Thu, 2005-10-27 at 11:52 +0100, Julian Foad wrote:
> >
> >>This review is a picky one. All of these comments are about the help text; I
> >>didn't find any other problems this time (but I know there are ongoing
> >>discussions about negative changes).
> >
> > I fixed all of these before the commit, except for NUMBER-1:NUMBER, and
> > "specify" :). I will fix the typos momentarily.
> Oh, you've committed it already. Not one to hang around, are you? :-)

I asked on IRC if everyone was okay with me committing it, at a late
hour, and took the two responses i got saying "Yes" as consensus.

You just have to know the right time to get consensus :)

> > 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.

I've attached a short followup to fix all these.

Does it address all your concerns?
I've already modified the revision log to specify the test names, and
fix the table name.


  * 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.
    Correct typo and spacing in error for -r.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Thu Oct 27 15:38:00 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.