etornick <etornick@comcast.net> wrote on 02/17/2006 09:26:34 AM:
> I have been experimenting with a project I have in the trunk. I created
a
> branch for this project and wanted to be sure I understood how to do
> periodic merges from the branch to the head ( I know the same would
apply
> for going the other way)
>
> My confusion lies in the way in which to pick the range of revisions to
do
> the merge. If I pick them incorrectly the merge doesn't do anything,
then
> when I pick the right ones the merge goes great.
>
> For example. Lets say that I am merging from the branch into the head.
And
> let's say that edits have occured in both the head and the branch since
the
> last time I merged.
>
> I checkout a working copy of the head (a new working copy). The first
> problem I have is understanding what url to use for the start revision.
Do I
> use the head or the branch. Then do I switch URL's to get the next
revision?
> The highest revision number may be in the head or the branch depending
upon
> where the last edit happened.
The help for the Merge dialog tries to explain it, so I would check that
out if you haven't already.
When you do a merge, you are basically giving the merge command the
information needed to create a diff and then apply that diff to your
working copy.
You were on the right track. You want a WC that is connected to HEAD. You
then take the merge command and specify just the URL to the branch. The
easiest thing to do is then hit the Show Log button and select the
revision range from the branch that you want to merge to trunk. Hit OK
and the correct from and to revision will be filled in automatically to do
that merge.
If you want, you can use the Dry Run button to check it. Just make sure
the Console view was already open and visible so you do not have to close
the dialog.
On selecting the revisions, the only thing to know is that Subversion can
only do a contiguous range. So if you want to "cherry-pick" the revisions
you have to do more than one merge command to get the revisions you want.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Feb 17 15:34:54 2006