Changes between Version 3 and Version 4 of ImprovingPractices


Ignore:
Timestamp:
Aug 8, 2007, 12:35:09 AM (15 years ago)
Author:
Beman Dawes
Comment:

Change terminology from merge to copy

Legend:

Unmodified
Added
Removed
Modified

  • ImprovingPractices

    v3 v4  
    4949== Repository Organization ==
    5050
    51 '''''Release tree'''''  -  [#release-ready release-ready] tree into which libraries are merged after beta testing. <i>We may decide to make this tree read-only except for the release management team.</i>
     51'''''Release tree'''''  -  [#release-ready release-ready] tree to which libraries are copied after release-ready. ''We may decide to make this tree read-only except for the release management team.''
    5252
    5353 The URL for the release tree is //svn.boost.org/svn/boost/release
    5454
    55 '''''Release tags''''' - These are copies of the the Release Branch made by the release manager, identifying the basis for generating tarballs and such. There are two forms; one for release candidates, another for final releases.
     55'''''Release tags''''' - These are copies of the the Release tree made by the release manager, identifying the basis for generating tarballs and such. There are two forms; one for release candidates, another for final releases.
    5656
    57  The URLs for release candidates are in the form //svn.boost.org/svn/boost/tags/Version_1_35_0_RC1
     57 The URLs for release candidates are in the form //svn.boost.org/svn/boost/release/Version_1_35_0_RC1
    5858
    59  The URLs for final releases are in the form //svn.boost.org/svn/boost/Version_1_35_0
     59 The URLs for final releases are in the form //svn.boost.org/svn/boost/release/Version_1_35_0
    6060
    6161'''''Main trunk''''' - The main development and test location.
    … …  
    7575Developers can ensure a [#stable stable] development environment by checking out //svn.boost.org/svn/boost/release as their working copy, and then [http://svnbook.red-bean.com/en/1.1/ch04s05.html switching] only the library they are working with to //svn.boost.org/svn/boost/trunk or a library specific development branch.
    7676
    77 === Merging from main trunk to release tree ===
     77=== Copying from main trunk to release tree ===
    7878
    79 Only when a library update is tested and stable on trunk, and is fully [#release-ready release-ready], is it merged into the [#release-tree release tree].
     79Only when a library update is tested and stable on trunk, and is fully [#release-ready release-ready], is it copied into the [#release-tree release tree]. (This copy operation is performing what in CVS would be called tagging.)
    8080
    81 ''Details of when the release tree merges are acceptable and who actually does the merge are yet to be worked out. One possibility is to allow any developer to merge into the release tree at any time except immediately before a release. A "Release_candidate" tag could be maintained, and either manually or by script moved up to the head of the release tree once the newly merged library passes all tests.''
     81''Details of when copies into the release tree are acceptable and who actually does the copy are yet to be worked out. One possibility is to allow any developer to copy into the release tree at any time except immediately before a release.''
    8282
    8383=== Special case: Prerequisite libraries ===