Re: [Subclipse-users] Merging in 0.9.105

news <news@sea.gmane.org> wrote on 01/26/2006 10:31:53 AM:

> Does merging work at all in 0.9.105?

I use it every day.

> Here's what happens:
>
> - My branch WC is committed.
>
> - I select Team->Merge on the directory with updated files
>
> - From: URL is the project's URL on trunk with HEAD rev
>
> - I select the directory's URL on my branch as To:

Why? According to your command line, the from and to URL should both be
trunk.

> Doing the above with the commandline tools "just works":
> svn merge -r myrev:HEAD <URL-to-trunk/dir> <WC-root/dirname>
> ..and bingo.

There is actually decent help associated with the dialog, I would
encourage you to review it.

You have a project in your workspace that is from your branch, correct?

Select the project and do Team -> Merge

Enter the URL of trunk in the From URL:

The easiest thing to do, if performance is not an issue, is to press Show
Log on the revision field and then select the contiguous range of
revisions from trunk that you want to merge to your branch. This will
fill in the From and To revision fields correctly to merge in the range of
revisions you selected. You can of course just type the values.

Then press OK.

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 Thu Jan 26 17:16:29 2006