On Monday, May 19, 2003, at 11:53 PM, Greg Hudson wrote:
> On Mon, 2003-05-19 at 23:36, Ben Collins-Sussman wrote:
>> Luke Blanshard <luke@blanshard.us> writes:
>>
>>> This seems like the clearest and simplest approach being tossed
>>> around. But it's not getting much attention. Why is that exactly?
>
> Probably because I injected it late in the thread.
>
>> Ghudson, I think your proposal has some promise. But for those of us
>> who are a bit slow-witted, can you demonstrate how your --old/--new
>> diff syntax would be used to cover all five use-cases I outlined in
>> the earlier mail? Humour me... :-)
>
> 1. show local mods in a working copy
> svn diff
> (or: svn diff file1 file2 ..., if only for some files/dirs)
>
> 2. compare a wc path with a different version of itself
> svn diff -r M path
> (or: svn diff --old=url[@REV] path, to compare against a branch)
>
> 3. compare two specific versions of a wc path
> svn diff -r M:N path
> (or: svn diff --old=url1[@REV] --new=url2[@REV] path, to compare
> path in two different branches)
>
> 4. compare any two arbitrary repos paths/revs
> svn diff --old=url1[@REV] --new=url2[@REV]
>
> 5. compare a wc path to an arbitrary repos path
> svn diff --old=url1[@REV] --new=path
I would prefer this over any solution that ends up with two diff
commands, it really seems like the 'right thing to do' in this case.
We get all the functionality, preserve the simple 'iterative' use case
people (myself included) like so much, and avoid that embarassing
discussion where we have to explain the difference between 'diff' and
'cmp'.
+1
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 20 14:36:32 2003