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

Scenarion about merging trunk into a branch

From: Claude Montpetit [Nertec] <cmontpetit_at_nertec.com>
Date: 2004-09-22 16:17:22 CEST

Hi,
I read an interesting thread from this list about merging back a branch
into trunk when the trunk has previously been merged into the branch.

Here is a link to an archive that shows the thread nicely:

  http://www.contactor.se/~dast/svnusers/archive-2004-06/index.shtml#1105

There is another scenario we have here that I believe requires merging
the trunk into a branch:

  * Developer1 works on a branch.

  * Developer2 on another branch.

  * Developer2 complete his work and merges his work in the trunk.

  * Developer1 needs code that developer2 added to the trunk.

  * Developer1 merges the trunk into his branch and continues to work on
his branch.

  * When developer1 completes his work, he merges his branch to the
trunk following the recommendation found in the mentionned thread.

To me, this seems to be a common scenario (requiring to merge the latest
changes from the trunk into a branch).

 From reading the thread linked above, I must conclude that this process
is not documented in the SVN book and that I must follow the
recommendations in the above thread. Is this correct?

-- 
Claude Montpetit
Nertec
-- 
Claude Montpetit
Nertec
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 22 16:17:59 2004

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