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

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

From: Karl Auer <kauer_at_biplane.com.au>
Date: 2006-03-27 06:21:17 CEST

Hi there.

I made a branch, then switched to it and have been working on that
branch for a while. I have a working copy of that branch that is up to
date. I have no working copy of the trunk revision.

Now I want to merge all the changes from the branch back into the trunk
(essentially making the trunk the same as the branch).

So I highlighted the project with the branch working copy, and chose
Team->Merge. The branch appears in the "From:" URL and I can enter the
starting and ending revisions to be merged easily enough. But where do I
say that I want those things merged into the trunk? There is a
destination working copy field, but it is greyed out and points to the
Eclipse workspace base directory, saying that the URL is the branch's
URL...

Could someone offer a step-by-step here?

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 06:21:53 2006

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