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

Re: Branch / Merge

From: Bert Van den Brande <cyruzb_at_gmail.com>
Date: 2005-05-02 11:27:50 CEST

Also,

look in the Tortoise help for 'merge' or go directly to '4.16.2.
Merging A Branch Back Into The Main Branch' .

Obviously, you define your trunk as the 'from' version , since you are
merging from trunk into a branch ...

Friendly greetings,
Bert Van den Brande

2005/5/2, Ulrich Eckhardt <eckhardt@satorlaser.com>:
> Annick Collet wrote:
> > Recently I have created a branch : XP_branch , as the migration to XP
> > is planned and the sw should be migrated . The trunk and XP_branch are
> > slighlty different . But some updates from the trunk should be
> > incorporated in XP_branch.
> >
> > I would like to "merge it" in the branches/XP_branch and avoid the
> > developpers to duplicates their updates.
> >
> > How can merge some updates from trunk to XP_branch either with the
> > svn CLI or with Tortoise.
>
> The thing you want is described in the Subversion book, just that they assume
> that you make a branch in order to implement a certain feature and then merge
> those changes back to the trunk. So, all you need to change is the source and
> target paths of what you want to merge.
>
> Uli
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 2 11:29:52 2005

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