Changes between Version 1 and Version 2 of WorkingConventions/Releases


Ignore:
Timestamp:
Aug 24, 2012 9:48:50 AM (20 months ago)
Author:
simonmar
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions/Releases

    v1 v2  
    2222The `master` branch of all repositories is the main development branch.  We often call this "HEAD" for historical reasons. 
    2323 
    24 There is a "stable" branch corresponding to each major release, named after the major version.  For example, the stable branch corresponding to the 7.4.1 release is called `ghc-7.4`.  Every repository (see [wiki:Repositories]) has a `ghc-7.4` branch, so you can switch a complete tree to the branch with `./sync-all checkout ghc-7.4`. 
     24There is a '''stable branch''' corresponding to each major release, named after the major version.  For example, the stable branch corresponding to the 7.4 series of releases is called `ghc-7.4`.  Every repository (see [wiki:Repositories]) has a `ghc-7.4` branch, so you can switch a complete tree to the branch with `./sync-all checkout ghc-7.4`. 
     25 
     26Releases are only made from the stable branch.  The stable branch for a major release is created by the release manager shortly before the release candidate (a couple of weeks or so).  When the release is made, the stable branch (of all repositories) is tagged with the release name, e.g. `ghc-7.4.1`. 
    2527 
    2628Our convention is that only the release manager modifies the stable branch.  Other developers request that changes are merged to the branch in one of the following ways: 
    2729 
    28  * By moving a ticket into the "merge" state once it is fixed.  Please do this if you fix a bug and the fix is suitable for the branch. 
     30 * By moving a ticket into the "merge" state once it is fixed.  Please do this if you fix a bug and the fix is suitable for the branch.  Check that the milestone field of the ticket identifies the correct release target. This helps later on when we need to know whether a bug was fixed in a particular release, and also helps us to collect a list of all bugs that were fixed in a given release. 
    2931 
    30  * By emailing the release manager to ask that a patch be merged. 
     32 * By emailing the release manager to ask that a patch be merged.  This is appropriate when there isn't a ticket corresponding to the patch. 
    3133 
    3234The release manager will usually merge patches with `git cherry-pick`, so patches on the branch will have different SHA-1 hashes from their corresponding patches on `master`.  This means that you can't use tricks like `git name-rev` to see whether a particular patch is on the branch - just search through the output of `git log ghc-7.4` instead. 
    3335 
    34  
    35