Changes between Version 1 and Version 2 of Software/ConfigManagement/SubversionBranchMngmt


Ignore:
Timestamp:
11/10/10 14:10:07 (9 years ago)
Author:
astephen
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Software/ConfigManagement/SubversionBranchMngmt

    v1 v2  
    55== Related pages == 
    66 
    7  * [Software/ConfigManagement Software Configuration Management in NDG] 
    8  * [SubversionCheatsheet Our Subversion Cheat Sheet] 
    9  * [OurSubversionGuidance Our Subversion Guidance] 
     7 * [wiki:Software/ConfigManagement Software Configuration Management in NDG] 
     8 * [wiki:SubversionCheatsheet Our Subversion Cheat Sheet] 
     9 * [wiki:OurSubversionGuidance Our Subversion Guidance] 
    1010 
    1111== Introduction == 
     
    4040A typical release cycle would involve the following steps: 
    4141 
    42  1. [#CreateABranchFromTheTrunk] 
    43  2. [#MakeChangesInTheBranch] 
    44  3. [#TagTheTrunkBeforeMergingInTheModifiedBranch] 
    45  4. [#MergeInTheModifiedBranch] 
    46  5. [#ResolveConflicts] 
    47  6. [#TagTheUpdatedTrunk] 
    48  7. [#CreateASourceDistributionAndEggFromTheTaggedVersion] 
     42 1. [#CreateABranchFromTheTrunk Create A Branch From The Trunk] 
     43 2. [#MakeChangesInTheBranch Make Changes In The Branch] 
     44 3. [#TagTheTrunkBeforeMergingInTheModifiedBranch Tag The Trunk Before Merging In The Modified Branch] 
     45 4. [#MergeInTheModifiedBranch Merge In The Modified Branch] 
     46 5. [#ResolveConflicts Resolve Conflicts] 
     47 6. [#TagTheUpdatedTrunk Tag The Updated Trunk] 
     48 7. [#CreateASourceDistributionAndEggFromTheTaggedVersion Create A Source Distribution And Egg From The Tagged Version] 
    4949  
    5050This cycle ensures that we have a version of the trunk tagged immediately before and after the modified branch has been