[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] back out changes with --change -N

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2006-02-02 01:03:34 CET

On Wed, 2006-02-01 at 14:17 -0800, David James wrote:
> At some point, I'm hoping to patch the "-c" option to accept a list of
> changes. For example, to merge the BDB fixes from trunk to 1.3.x, we
> would type:
> svn merge -c18144 -c18164 -c18170 -c18171 -c18184 ../trunk .

We never assign a meaning to repeated specifications of the same option.
This would have to be something like:

  svn merge -c 18144,18164,18170,18171,18184

Of course, you'll have to decide what happens if 18144 results in
conflicts to some files, and 18164 has some changes to the same files,
which may or may not themselves conflict with the original file or with
18144 or both. But that's not a syntactic issue.

> Does this idea play nicely with the "negative revision number
> concept"?

Yes, it does, much more so than it plays nicely with the "--reverse"
option.

(I'm still -0 on the whole concept, but if we're going to do it at all,
negative revision numbers do seem more flexible and less intrusive than
a --reverse option.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 2 01:04:55 2006

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.