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

Re: 'svn merge -rX' UI annoyance.

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2005-08-05 18:54:18 CEST

On Fri, 2005-08-05 at 11:37 -0500, Ben Collins-Sussman wrote:
> 'svn merge' may have flexible syntax, but merge *always* compares two
> revisions in the repository. In that sense, it's always equivalent
> to the 3rd case of 'svn diff'.

Oh, I see. Merge only uses wc paths to identify URLs; you can't use wc
contents as merge sources.

Anyway, the point is more that diff, as well as merge, could benefit
from an abbreviated form of -rX-1:X, but isn't in a position to redefine
-rX. Also, that if people learn that -rX behaves a certain way in
merge, they might start expect it to behave that way in other commands,
particularly in the analagous case of diff.

I'm not -1 on making merge -rX do what CMike wants, particularly if we
can't find an acceptable syntax for abbreviating -rX-1:X. But I think
extending the revision-range syntax is more appropriate than Keloizing
"svn merge -rX".

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 5 18:55:16 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.