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

[TSVN] Re: Merging from branches to WC

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-19 12:38:12 CET

crine wrote:
> I have some trouble to merge my branche to the WC (moving my
> modifications from my branch to the trunk).
>
> here is some explanation :
> My trunk has evolved after I created my branch. I have created some
> new directories which don't exist in the branch I'm trying to merge.
>
> So each time I try to merge, Tortoise wants to delete the new
> directories in the trunk. The "switch" command do the same thing.

You haven't explained what you are doing, but I can guess that it is the
same mistake that many other people have made. We have now improved the
docs to explain it better. You can see the updated version in the
nightly build (1.1.3 beta) or wait until Friday for the official 1.1.3
release.

It sounds like you need to merge a range of revisions in your branch
back into the trunk.

Make sure your WC is for the trunk, not the branch (Switch to trunk).

Open the merge dialog.
Select the branch URL as the "From URL"
Select the revision just _before_ your changes start.
Make sure the "Use From: URL" checkbox is checked.
Select the last revision in the branch that you want to merge.
Go!

The From/To pair is being used to select the range of revisions that are
being merged. They do _not_ represent the source and destination of the
merge. The destination is always your WC.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 19 12:37:48 2005

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