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

Repository Structure & Merging Strategy

From: Luke Mason <lmason_at_oasisasset.com.au>
Date: 2007-08-21 08:56:51 CEST

We plan to move to SVN from PVCS - mostly due to licencing costs as we
expand.
 
We have a 2 week prod build cycle, and a 1 week test build cycle. We
work on issues (BR's) that must be isolated as they are worked on.
 
The current planned repository layout is
/branch/BR/<br number>
/branch/BR/archive/<br number> - where old br's are moved to
eventually.
/branch/prod_build/<yyyymmdd>
/branch/test_build/<yyyymmdd>
/trunk
 
When a BR is created, branch from trunk to a new BR. number comes from
tracking system
 
When a test build is done, branch from trunk to new test branch. Merge
BR's that are in test into current test branch. Build that branch. Test
Deploy.
 
When a prod build is done, branch from trunk to new prod branch. Merge
BR's that are ready for brod into current test branch. Build that
branch. Test Deploy. Real deploy. Merge prod build branch into trunk.
Tag Current Prod.
 
After every prod build, rebase all active BR branches.
 
 
Does this make sense as a workflow? SVN is a very differnt paradigm to
PVCS, and getting my head aroud it has been difficult. We can't promote
the whole test_build to prod, as different BR's are in differnt states,
and one may be in test/uat/back in dev when abother in that test build
is ready to go into prod.
 
Is it to much merging? Should I wait for 1.5 before making the move?
 
Please comment.
 
 
 

Luke Mason
Analyst Programmer

 

 

 

Oasis Asset Management Limited
Ground Floor, 65-67 Burelli Street
WOLLONGONG NSW 2500

 

 

Telephone:

61 2 4228 2744

Facsimile:

61 2 4228 2360

Email:

lmason@oasisasset.com.au <mailto:lmason@oasisasset.com.au>

Website:

www.oasisasset.com.au <http://www.oasisasset.com.au/>

 

"This email is intended for the named recipient only. The information contained in this message may be confidential, or commercially sensitive. If you are not the intended recipient you must not reproduce or distribute any part of this email, disclose its contents to any other party, or take any action in reliance on it, or in reference to it. If you have received this email in error, would you please contact the sender immediately and delete/destroy all copies of this message, both electronic and otherwise. It is the recipient's duty to virus scan and otherwise test the enclosed information before using the information or loading attached files onto any computer system. Oasis Asset Management Ltd does not warrant that the information contained in this e-mail is free from viruses, defects, errors, interception or interference. Any views expressed in this message are those of the individual sender, except where that sender specifically states them to be the views of Oasis Asset Management Ltd."

______________________________________________________________________
This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email
______________________________________________________________________

oasis_logo.gif
Received on Tue Aug 21 08:55:01 2007

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