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

Re: Unable to merge

From: Kurt Pruenner <leak_at_gmx.at>
Date: Mon, 04 Feb 2008 15:41:51 +0100

Oliver Salzburg wrote:
> Hi,
> i am trying to merge changes from the trunk
> into my branch. So, in the the dialog, i select
> the trunk directory in the From field and select
> HEAD revision.
> In the To field i select my branch and also the
> HEAD revision.

That is - plain and simple - wrong.

A merge always gets merged into your working copy, i.e. into the
directory you started the merge in. So if you want to merge anything
into tyour branch, you need to check it out somewhere (I guess you'll
already have it checked out somewhere) then run "SVN Merge" on the
directory you checked everything out into.

The from and to fields are for telling svn which revision range of the
*trunk* (in your case) that you want to merge, thus the default option
of using the same URL for both - of course you can use a different URL
if you want to specify a tag instead, but if you choose a trunk and a
branch URL you'll most likely get an empty set of changes between those
two, and it definitely isn't what you want to do...

So you need to specify "HEAD" as your "to" revision and some earlier
revision number as your "from" revision.

-- 
Kurt Bernhard Pruenner --- Haendelstrasse 17 --- 4020 Linz --- Austria
.......It might be written "Mindfuck", but it's spelt "L-A-I-N".......
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-02-04 16:03:06 CET

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