Re: Making xemacs-21.5.3+/i686-pc-cygwin
>>>>> "Stefan" == Stefan Monnier
<monnier+lists.xemacs.beta/news/(a)RUM.cs.yale.edu> writes:
>>>>> "Stephen" == Stephen J Turnbull
<turnbull(a)sk.tsukuba.ac.jp> writes:
>> If you don't, or if you make local changes, then "cvs diff -u
>> ." tells exactly what is different between your workspace and
>> cvs HEAD.
Stefan> No, it only shows the diff with the BASE, not the HEAD.
Er, I've searched the CVS docs for definitions of these various terms,
and not gotten much joy. It's quite likely i've used them incorrectly.
What I mean is that if you have no sticky tags defined, then
cvs diff .
gives the same diff (give or take a level of directory structure) as
cvs checkout -d newspace; diff -r oldspace newspace.
Is that correct? It's certainly what I expect. If not, how do you
get that?
No, you're mistaken. As I said, to get the diff between the file
and the HEAD revision (i.e. the more recent revision on the trunk,
or maybe on the current branch, I cannot remember), you need
to use `cvs diff -rHEAD'. `cvs diff' without any specification of a
particular revision gives you the diff between the file and the BASE
(i.e. the revision that you have currently checked out), i.e. it shows
the changes you've made locally.
Stefan