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

Re: Resolution of 'svn diff' change?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-05-19 19:29:35 CEST

cmpilato@collab.net writes:

> Ben seemed convinced, but asked for those two usage messages. Here
> they are:
> $ svn help compare
> compare (cmp): display the differences between two paths.
> usage: 1. compare [-r N[:M]] [TARGET]
> 2. compare TARGET1[@N] TARGET2[@M]
> Display the differences between two targets (one of which may be implied)
> in a format suitable for use with most 'patch' programs.
> 1. In the first syntax, TARGET is either a working copy path
> or URL. If no TARGET is specified, a value of '.' is assumed.
> Use the -r option to specify revision ranges -- if TARGET is a
> URL, this defaults to HEAD:PREV; if TARGET is a working copy
> path, the default is to display local modifications.
> 2. If the alternate syntax is used, TARGET1 and TARGET2
> (perhaps at specified revisions N and M, respectively) will
> be compared against each other.

I'd prefer it if the compare command did not support implied
targets. That makes it more obvious that two arguments are required,
and that they get compared.

> $ svn help diff
> diff (di): display local working copy modifications
> usage: diff [WC-PATH ...]
> Display uncommitted modifications made to working copy targets in a
> format suitable for use with most 'patch' programs.

I'd prefer it if the diff command accepted [-r N[:M]]. The diff
command will do all the comparisons, except those that involve
comparing two targets against each other. The compare command handles
the latter case.

If we take your proposal without change then we lose some of the
current functionality, it is not possible to do

   svn diff -rN:M wc/foo.c wc/bar.c

It doesn't make sense to introduce a new command and lose

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon May 19 19:30:33 2003

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.