[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: <kfogel_at_collab.net>
Date: 2005-10-25 21:49:09 CEST

David James <james82@gmail.com> writes:
> On 25 Oct 2005 14:07:08 -0500, kfogel@collab.net <kfogel@collab.net> wrote:
> > Alan Barrett <apb@cequrux.com> writes:
> > > On Tue, 25 Oct 2005, C. Michael Pilato wrote:
> > > > Why, again, was it considered more desirable to introduce -c than to
> > > > simply start allowing -rM to mean -rM-1:M ?
> > >
> > > That would break the existing meaning of "svn diff -r N".
> > >
> > > Perhaps some other syntax could be defined, while still using "-r"
> > > instead of adding "-c"? For example, "svn diff -r :999" is easy enough
> > > to type, and could be defined to mean the same as "svn diff -r 998:999".
> >
> > Yes, +1. (Sorry, I forgot about the current diff syntaces.)
> >
> > I'd really like to not use up a single letter option, especially when
> > the meaning is so close to an existing option. If we can get there by
> > twiddling the syntax of the optarg instead, that'd be great.
>
> When I see syntax like :N or N:, I would assume it refers to (0:N, N:HEAD).
> The -rN syntax is equally ambiguous. See
> http://svn.haxx.se/dev/archive-2005-08/0201.shtml
>
> 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

You've convinced me. I withdraw my not-very-solid objections.

-Karl

-- 
www.collab.net  <>  CollabNet  |  Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 25 23:10:40 2005

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