July 2005
Intermediate to advanced
944 pages
158h 24m
English
book
Linux in a Nutshell, Fifth Edition
by Ellen Siever, Aaron Weber, Stephen Figgins, Robert Love, Arnold Robbins
Content preview from Linux in a Nutshell, Fifth Edition
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,
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.
Conceptual Overview | 799
CVS
This is the Title of the Book, eMatter Edition
Copyright © 2006 O’Reilly & Associates, Inc. All rights reserved.
CVS Wrappers
When resolving conflicts, the usual method CVS uses is MERGE, which means
that CVS puts both versions of the conflicting group of lines into the file,
surrounded by special markers. However, this method doesn’t work for binary
files. Thus, the second conflict-resolution method is COPY, which presents both
versions of the file to the user for manual resolution.
You can manually specify the conflict resolution method and keyword expansion
method when a file is added to a repository, as well as later, after the file is
already there. However, doing so manually for lots of files is painful and error-
prone. Wrappers allow you to specify the conflict resolution method and
keyword expansion method for groups of files, based on filename patterns. You
may do this on the command line or, more conveniently, by placing the wrappers
into a .cvswrappers file. Each line has the following format:
wildcard option 'value' [option 'value' …]
The wildcard is a shell-style wildcard pattern. If option is -m, it indicates the
conflict resolution method. In this case, value should be either MERGE or COPY.
If option is -k, then value is one of the keyword resolution modes (b, k, o, etc.).
Stickiness
When some aspect of the persistent state of a file in a sandbox is different ...
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.