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

On 3/27/06, Karl Auer <kauer@biplane.com.au> wrote:
> 1: Disconnect my branch working copy and delete the project.

  Well, you don't need to disconnect and delete, you can check out the
trunk in another project.

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

  Oh, I never read that before. It shows the same informations for me,
I guess it's showing the directory containing the working copy and
that seems just fine.
  I think that's correct, just click merge and it will be merged in
the trunk project. The merge affects only the working copy, so you can
try it and revert if it causes problems.

  mic

--
Michele Campeotto - www.micampe.it
It's psychosomatic. You need a lobotomy. I'll get a saw.
	-- Calvin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org