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.
Binary Files and Translation
|
249
Metadata Properties
A new feature of Subversion is that you can attach arbitrary metadata (or properties)
to files and directories. Properties are arbitrary name/value pairs associated with files
and directories in your working copy.
To set or get a property name, use the
svn propset and svn propget subcommands.
To list all properties on an object, use
svn proplist.
For more information, see “Properties” in Chapter 7.
Conflict Resolution
CVS marks conflicts with in-line conflict markers, and prints a C during an update.
Historically, this has caused problems, because CVS isn’t doing enough. Many users
forget about (or don’t see) the
C after it whizzes by on their terminal. They often for-
get that the conflict markers are even present, and then accidentally commit files
containing conflict markers.
Subversion solves this problem by making conflicts more tangible. It remembers that
a file is in a state of conflict, and won’t allow you to commit your changes until you
run
svn resolved. See “Resolve Conflicts (Merging Others’ Changes)” in Chapter 3
for more details.
Binary Files and Translation
In the most general sense, Subversion handles binary files more gracefully than CVS
does. Because CVS uses RCS, it can only store successive full copies of a changing
binary ...
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.