June 2003
Intermediate to advanced
336 pages
9h 49m
English
Content preview from Essential CVSBecome an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.
Comparing File Revisions
As your project develops, you sometimes need to compare a current revision with an old one, or compare two older revisions with each other. This usually happens when several developers are working on the same file and you need to know which changes were made to a file since you last worked on it.
The cvs diff
command
compares two revisions of a file and displays the differences. It
uses a version of the GNU diff program internal
to CVS; this code is also used when revisions are merged during
cvs update.
The diff command and the similar
rdiff
command
are also useful for creating patches to be installed by the GNU
patch program.
cvs diff has the following syntax:
cvs [cvs-options] diff [command_options] [filenames]
You can call cvs diff with filenames,
directories, or module names. If you don’t give a
filename, the current working directory is the default.
Usually, you call cvs diff with at least one
-r tag or -D date command
option. If you invoke it with a single -r or
-D parameter, CVS compares the current copy in
the working directory with the version in the repository. For
example, if you check out revision 1.6 of
Makefile, edit the file, then run cvs
diff -r 1.6 Makefile, diff displays
the changes you made to Makefile since you
checked it out.
If you invoke cvs diff with two -r
or -D options, CVS compares the two
revisions against each other. The command cvs diff -r 1.5
-r 1.7 Makefile displays the changes between revisions 1.5
and 1.7.
Example 5-14 shows ...
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Read now
Unlock full access
More than 5,000 organizations count on O’Reilly
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.Julian F.
I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.Addison B.
I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.Amir M.
I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.