[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: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2005-05-02 11:12:35 CEST

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.


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:13:01 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.