[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: <cmpilato_at_collab.net>
Date: 2003-05-23 05:40:17 CEST

Philip Martin <philip@codematters.co.uk> writes:

> Philip Martin <philip@codematters.co.uk> writes:
> > Greg Hudson <ghudson@MIT.EDU> writes:
> >
> >> usage: 1. svn diff [-r N[:M]] [--old=OLD-TARGET] [--new=NEW-TARGET] [PATH ...]
> >> 2. svn diff -r N[:M] URL
> > [...]
> >> Does anyone else want to have a crack at implementing this?
> >
> > Yes.
> It works. I'd like to add
> 3. svn diff URL1[@N] URL2[@M]
> Shorthand for 'svn diff [-rN[:M]] --old URL1 --new URL2'
> where N and M default to HEAD.
> The reason for this is so that I think there should be a diff command
> with the same syntax as the merge command
> svn merge URL1[@N] URL2[@M] path
> so that a user can preview the changes to be merged without having to
> "translate" the command.

I too think that merge and diff should have a matched syntax wherever
possible -- I never use merge without first "merging" to stdout ;-).

So there's two ways to go:

   - add the @-syntax back to diff
   - remove the @-syntax from merge

I've heard arguments for both ("keep the revision modifier with the
URL it modifies"; "gain '@' back as a character that is valid in paths
used with these functions"). I personally like the @-syntax, despite
the lossage, but I'll leave it to others to decide.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 23 05:39:41 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.