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

Re: RFC: change 'svn merge' default behavior.

From: Branko Čibej <brane_at_xbc.nu>
Date: 2004-01-15 23:42:58 CET

Eric Gillespie wrote:

>My primary point all along has been this:
>svn export URL1 1
>svn export URL2 2
>diff -ru 1 2
>should do the same as
>svn diff URL1 URL2
I disagree. There is a fundamental difference between the two: In the
first case, you're comparing two unversioned trees; even if the diff
tool knew how to use history information, there isn't any.

In the second case, you're comparing two parts (branches) of a versioned
repository, and all history information is available. This diff should
tell you how one branch is related to the other, and ignoring history
defeats this purpose.

>It shouldn't matter whether the URLs represent files or
>directories or vendor branches or whatever. In other words, Just
>Diff Them Dammit! :)
Yes, this is a valid use case -- but should not be the default.

>If svn diff is to behave differently than diff(1) by default, we
>should rename it. I don't like that option though...
That's nonsense. "svn mv", "svn cp", "svn rm" all behave differently
than their shell equivalents -- in subtle ways, of course. Diff is the same.

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 15 23:46:06 2004

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.