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

Re: [TSVN] Merging from branches to WC

From: Johan Appelgren <johan.appelgren_at_gmail.com>
Date: 2005-01-19 12:36:44 CET

On Wed, 19 Jan 2005 12:12:40 +0100, crine <crine@4dconcept.fr> wrote:
> Hi all,
>
> 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.
>
> Why that ? if it's normal, what should I do to merge my branch without
> deleting my updated in the trunk.
>

How did you try to do this merge? When merging changes from a branch
to trunk you don't want to merge what has changed from the HEAD of
trunk to the HEAD of your branch. You want to merge the changes made
from the start of your branch to the HEAD of it to trunk. I found this
best explain in the subversion book.
http://svnbook.red-bean.com/en/1.1/svn-book.html#svn-ch-4-sect-4.1

/Johan

---------------------------------------------------------------------
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:25 2005

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