[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: Karl Auer <kauer_at_biplane.com.au>
Date: 2006-03-27 14:28:45 CEST

> > 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.

Regards, K.

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Karl Auer (kauer@biplane.com.au)                   +61-2-64957160 (w/h)
http://www.biplane.com.au/~kauer/                  +61-428-957160 (mob)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Mar 27 14:29:50 2006

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