Branch / Merge

Dear all,

I have structured my svn repository as follow:

   /project1 /trunk
                 /tag
                 /branches
                 /branches/XP_branch

  /project2 /....

  .....

 Main source is in trunk.
 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.

Thanks, Ann
           

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 2 10:16:55 2005