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.
840
|
Chapter 14: The Subversion Version Control System
This is the Title of the Book, eMatter Edition
Copyright © 2006 O’Reilly & Associates, Inc. All rights reserved.
Basic Version-Control Operations
Actual data is kept in a repository, a set of directories and files managed by
Subversion. Users use the svn client program to access the repository and make
changes to it.
Subversion uses the copy-modify-merge development model. You make a private
copy of a given project in a sandbox. (This is often called checking out a copy.)
Like CVS, this private copy is not locked in the repository. You then make all the
changes you like to the copy within the sandbox, without having to worry about
what other developers are doing. As you work, you can compare your changes to
the version you started with, as well as the version currently in the repository.
Once you’re satisfied with the changes, you commit them, sometimes referred to
as a check-in. (These terms come from RCS and CVS.)
In the event that another developer has modified part of a file that you were
working on and checked it in, when you commit your changes, Subversion notices
and indicates that a conflict exists. Conflicts are marked as such in the file, and
Subversion creates pristine copies of the file as it exists in the repository and of the
file as you modified it, so that you can do full comparisons. Once you have
resolved the conflict, you
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.