[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-25 21:20:23 CEST

On Tue, 2005-10-25 at 15:17 -0400, C. Michael Pilato wrote:
> Garrett Rooney <rooneg@electricjellyfish.net> writes:
>
> > On 10/25/05, Daniel Berlin <dberlin@dberlin.org> wrote:
> > > This adds an option "-c" (long form --change) that is shorthand for
> > > "<rev -1>:<rev>", to merge.
> > >
> > > The only thing i'm a little iffy on is whether we should add more state
> > > just so we can tell the user they specified both "-r" and "-c", instead
> > > of just saying we found multiple revision arguments (which could pop up
> > > from multiple -c's, multiple -r's, or mixing -c and -r)
> > >
> > > The -c option was discussed a while ago, and nobody seemed to object to
> > > it. They only objected to allowing the same formats that svk allows,
> > > instead of just the single revision form.
> > >
> > > I'll wait a few days for objections or ideas or whatever before
> > > committing.
> >
> > +1 in concept, I'd love to have this option available, it would make
> > reviewing changes and merging them WAY easier. You'll probably want
> > to make 'svn diff' accept the option as well as merge though.
>
> Why, again, was it considered more desirable to introduce -c than to
> simply start allowing -rM to mean -rM-1:M ?

Because i didn't want a fight?

It looked like *everyone* was fine with -c, while only *some* people
were fine with adding that meaning to -rM

--Dan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 25 21:46:42 2005

This is an archived mail posted to the Subversion Dev mailing list.