[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: Christopher Ness <chris_at_nesser.org>
Date: 2005-10-27 16:31:08 CEST

On Wed, 2005-10-26 at 20:38 +1000, Peter McNab wrote:
> Bruce DeVisser wrote:
> >On Tue, Oct 25, 2005 at 04:54:20PM -0400, David James wrote:
> >>The "-c" or "--change" option is much more clear. Using the "-c"
> >>option, you can easily cherrypick changes from trunk to merge to a
> >>branch. Here's an example use case, from the STATUS file for 1.3.x.
> >>
> >>* r16930, r16975, r16989, r16990.
> >> Actually fix the cause of perl bindings segfault by allocating for
> >> ... (yada yada yada)
> >>
> >>To merge these four changes, I can type
> >> svn merge -c16930 ../trunk .
> >> svn merge -c16975 ../trunk .
> >> svn merge -c16989 ../trunk .
> >> svn merge -c16990 ../trunk .
> >>
> >>In future, I'd like to see the "-c" syntax extended, so that you can
> >>merge multiple revisions. Then you could just type:
> >> svn merge -c16930,16975,16989,16990 ../trunk
> >>
> >
> What would be the default behavior if the revision on the path specified
> did not exist, i.e. the path is a branch that did not exist at 16930?

Another usage question to flush out:

Can there be multiple '-c' flags passed as arguments? ie)
  svn diff -c100 -c200

The current '-r' flag fails with multiple revision arguments - then
suggests to use the range syntax, but what should the change flag do?

It would seem to be sane to allow multiple '-c' flags to compliment the
above comma separated syntax.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 27 16:32:44 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.