[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: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2003-05-23 05:49:48 CEST

On Thu, 2003-05-22 at 20:46, Philip Martin wrote:
> 3. svn diff URL1[@N] URL2[@M]

No strong opinion. It's another special case, but your argument for it
makes sense.

I note that the new svn diff syntax can be used as a merge syntax, and
that would help with cherry-picking ("svn merge --old=branch-base-url
--new=branch-url file1 file2"), but it would certainly make the common
case more verbose. And we'd have to punt the destination wc argument,
forcing it to always be ".". Not very compelling.

(And, while I'm here: I think Sander's point is worrisome, but I'm not
sure whether it should deter us. Basically, the issue is this: when a
user runs "svn diff -r M:N foo bar", our new syntax interprets foo
relative to rev N of the current working directory, which is not
necessarily what a user would expect--especially if the user just ran
"svn log foo" and wanted to look at the changes between two revs of it.
There's no way to repair this problem without abandoning the principle
that "we're always comparing two things, possibly with path
restrictions." (The sever breakdown case is when the user runs "svn
diff -r N:M foo bar" and foo and bar were both renamed from disparate
parts of the tree.)

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:50:52 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.