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

Re: svn diff, svn merge, and vendor branches (long)

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-12-07 18:09:16 CET

Eric Gillespie <epg@pretzelnet.org> writes:

> > simple. Making it work the way you would prefer would involve more
> > work, more special cases and more code. It would in fact be making
> > svn diff "smart", the very crime of which you have accused it.
> What? Not at all. The current problem is svn is doing
> something itself (i don't know what exactly). If it just handed
> the two arguments to diff(1), the diff would come out meaningful.

Currently 'svn diff' uses the same reporter/editor mechanism
irrespective of whether the URLs are directories or files. It appears
that you, and Greg Hudson, believe that diff should use a different
algorithm for comparing files and directories. That sounds like
increasing diff's "smartness", not reducing it.

Hmm, it appears that 'svn merge' already has special handling for
operating on single files; when that got written, it deviated from
'svn diff'. I'd certainly accept an argument that diff and merge
should be the same, I'd probably use it myself :)

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Dec 7 18:09:58 2002

This is an archived mail posted to the Subversion Dev mailing list.