June 2004
Intermediate to advanced
319 pages
12h 58m
English
Content preview from Version Control with Subversion
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.
This is the Title of the Book, eMatter Edition
Copyright © 2007 O’Reilly & Associates, Inc. All rights reserved.
14
|
Chapter 2: Basic Concepts
In the end, it all comes down to one critical factor: user communication. When users
communicate poorly, both syntactic and semantic conflicts increase. No system can
force users to communicate perfectly, and no system can detect semantic conflicts.
So there’s no point in being lulled into a false promise that a locking system will
somehow prevent conflicts; in practice, locking seems to inhibit productivity more
than anything else.
Subversion in Action
It’s time to move from the abstract to the concrete. In this section, we’ll show real
examples of Subversion being used.
Working Copies
You’ve already read about working copies; now we’ll demonstrate how the Subver-
sion client creates and uses them.
A Subversion working copy is an ordinary directory tree on your local system, con-
taining a collection of files. You can edit these files however you wish, and if they’re
source code files, you can compile your program from them in the usual way. Your
Figure 2-5. The copy-modify-merge solution (continued)
Repository
Harry
Read
Sally
A”
A’ A” A”
Harry compares the latest version
to his own
Repository
Harry Sally
A”
A* A”
A new merged version is created
Repository
Harry Sally
A*
A* A”
The merged version is published
Repository
Harry Sally
A*
A* A*
Now both users have each
others’ changes ...
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.