[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Subclipse-users] Merging a branch into the trunk - how?

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-03-27 15:58:09 CEST

Karl Auer <kauer@biplane.com.au> wrote on 03/27/2006 07:28:45 AM:

> > > Now I want to merge all the changes from the branch back into the
trunk
> > > (essentially making the trunk the same as the branch).
> >
> > You can only merge in a working copy, as a merge requires review and
> > commit after it has been performed, so you have to checkout the trunk
> > and then merge your branch in the the trunk working copy.
>
> So:
>
> 1: Disconnect my branch working copy and delete the project.
> 2: Check out the trunk.
> 3: Highlight the trunk project, select Team->Merge.
> 4: Specify the first revision in the branch as the start.
> 5: Specify the last revision in the branch as the end.
> 6: Merge to.....?
>
> Step 6 is what I don't get, the destination working copy directory that
> Subclipse shows (greyed out) is always the Eclipse workspace base
> directory, in my case /home/kauer/eclipse_workspace. The URL it shows,
> also greyed out, is the highlighted project's directory - that bit is
> correct.

Make sure everything is committed to your branch and then just use
Team->Switch to switch your working copy back to trunk. Then do Team ->
Merge.

If your branch only contains the changes for that branch, meaning you did
not merge any changes in trunk to the branch, then enter the URL for the
branch as the From/To URL. Press the Show Log button and select all of
the revisions that were made on that branch (except for the one that
created the branch). This will in the revision info correctly and then
press OK to run the merge.

If your branch has been synching with trunk, then enter the URL of trunk
as the From URL, and the last revision from trunk that you synched with as
the From Revision. Enter the URL of the branch as the To URL and HEAD as
the To Revision. Then press OK.

The help linked with the dialog has more in depth explanations.

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 Mon Mar 27 15:58:33 2006

This is an archived mail posted to the Subclipse Users mailing list.