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.
36
|
Chapter 3: Guided Tour
$ svn delete README
D README
$ svn revert README
Reverted 'README'
$ svn status README
README
Resolve Conflicts (Merging Others’ Changes)
We’ve already seen how svn status -u can predict conflicts. Suppose you run svn
update
and some interesting things occur:
$ svn update
U INSTALL
G README
C bar.c
Updated to revision 46.
The U and G codes are no cause for concern; those files cleanly absorbed changes
from the repository. The files marked with
U contained no local changes but were
Updated with changes from the repository. The G stands for merGed, which means
that the file had local changes to begin with, but the changes coming from the reposi-
tory didn’t overlap in any way.
But the
C stands for conflict. This means that the changes from the server overlapped
with your own, and now you have to manually choose between them.
Whenever a conflict occurs, three things occur to assist you in noticing and resolv-
ing that conflict:
• Subversion prints a
C during the update, and remembers that the file is in a state
of conflict.
• Subversion places conflict markers—special strings of text which delimit the
sides of the conflict—into the file to visibly demonstrate the overlapping areas.
• For every conflicted file, Subversion places three extra files in your working
copy:
filename.mine ...
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.