Re: diff after update

[Matt Riechers]

David Hugh-Jones wrote:
> 
> sorry if this is an obvious question, but after doing a CVS update, how do I
> diff files?
> 
> Here's the scenario:
> 
> I am working on a file. I haven't committed any changes. I do a general cvs
> update. I notice that that file shows "M".
> 
> How do I find out what the cvs update has changed, between my old uncommitted
> version, and the new version created by the update?

Unless the message said something like "merging changes into local copy",
nothing has changed to your local copy. It just means there are local changes
that aren't in the repository.

See <http://www.cvshome.org/docs/manual/cvs_16.html#SEC152> for details on the
output from 'cvs update'.

If it merged repository changes with your local changes, you can diff the
previous revision against your local copy to see the recently merged changes and
your uncommited changes. For example, if the new repository file rev is 1.2, and
you were working on 1.1, do 'cvs diff -r1.1 foo.c' to see the merged changes
with your local changes.

-Matt