Noel Yap wrote:
> --- kbrannen@gte.net wrote:
>
...
>>I disagree. I can see where "svn cat -r BASE file"
>>might be useful at times,
>>but the way I work, "svn cat -r HEAD file" is always
>>what I mean when I think
>>"svn cat file".
>>
>>We obviously work differently. :-)
>
>
> When you do "svn diff file", do you mean "svn diff -r
> BASE file" or "svn diff -r HEAD file"? IMHO, for
> consistency's sake, "svn cat file" should mean the
> "svn cat -r BASE file".
When I do a diff, I want it against HEAD, because I want to know what I'll be
[possibly] merging against. I don't need to know what I started from.
(normally :-)
In case you didn't see it earlier in the thread, I want "cat" so I can do
"graphical diffs" (against HEAD). While it would be nice for svn to allow
that natively, it's not required and can be easily faked with a very short
shell script (basically: get the file to a tmp_file {svn cat}, call xxdiff,
rm tmp_file) (substitute in xdiff, mgdiff, tkdiff, $DIFF, whatever, as required).
>
> Or, when you do "cvs ann file", do you want "cvs ann
> -r BASE file" or "cvs ann -r HEAD file"?
Again, HEAD.
If others have made changes, I probably need to know that, and see those
changes so I can "do the right thing" in my new code that I'm probably about
to commit. Therefore, HEAD is always the correct default (for me). If I need
to know what work I've done in *this session only* (rare for me), I can
actually specify "-r BASE" to force it. Of course, most of the time, HEAD and
BASE are the same thing because no one else has worked in the same file, at
least for me.
>
> Since I'm not the one implementing this feature, I'll
> leave it up to the implementer to decide.
Agreed. :-) I can always alias/script around things like this. I just wanted
to show there was another perspective.
Kevin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 14 18:08:08 2002