On Oct 30, 2007, at 3:23 PM, Fritz Anderson wrote:
I think, on the command line, I want "svn merge", but I admit I'm
finding that part of the Subversion Book a bit opaque.
How would I accomplish this?
That's the sort of thing you need "svn merge" for, and unfortunately
we don't have a human interface atop Subversion's merge functionality
in Xcode 3.0.
Here's a rundown on how merging works in Subversion.
The central idea of "svn merge" is that regardless of the form in
which you give it the arguments, it really takes three arguments in
the following order:
(1) Merge Source A (URL)
(2) Merge Source B (URL)
(3) Merge Destination (working copy)
These are used to perform what you can think of as a difference
operation in the Subversion merge algebra (Merge Source B minus Merge
Source A) and then apply the results of that operation to the Merge
Destination working copy.
Example 1: If you are working on a branch, to merge changes 123
through 130 from trunk into that branch you would write:
and thus -- since Subversion takes B minus A and applies it to the
destination, it reverts the change.
You can use essentially arbitrary URLs -- as long as they're in the
same repository -- for A and B, and an arbitrary path -- as long as it
points to a working copy from that repository -- for the destination.
-- Chris
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
http://lists.apple.com/mailman/options/xcode-users/email@hidden
