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.
Common Use-Cases for Merging
|
61
the merge command to compare two unrelated trees. For example, you may have
imported two source-code trees representing different vendor releases of a software
project (see “Vendor Branches” in Chapter 7). If you asked
svn merge to compare the
two trees, you’d see the entire first tree being deleted, followed by an add of the
entire second tree!
In these situations, you’ll want
svn merge to do a path-based comparison only,
ignoring any relations between files and directories. Add the
--ignore-ancestry
option to your merge command, and it will behave just like svn diff. (And con-
versely, the
--notice-ancestry option will cause svn diff to behave like the merge
command.)
Common Use-Cases for Merging
There are many different uses for svn merge, and this section describes the most com-
mon scenarios.
Merging a Whole Branch to Another
To complete our running example, we’ll move forward in time. Suppose several days
have passed, and many changes have happened on both the trunk and your private
branch. Suppose that you’ve finished working on your private branch; the feature or
bug fix is finally complete, and now you want to merge all of your branch changes
back into the trunk for others to enjoy.
So how do we use
svn merge in this scenario? Remember that this command ...
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.