[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 20:40:17 CEST

On Tue, 2005-10-25 at 11:34 -0700, Garrett Rooney wrote:
> 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.

Ah, yes, okay.

Diff should just work if i throw 'c' in the allowed options list, i'll
test it out.

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:15:40 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.