Changes between Version 26 and Version 27 of WorkingConventions


Ignore:
Timestamp:
Sep 7, 2007 11:11:28 AM (7 years ago)
Author:
simonmar
Comment:

move stable branch stuff to WorkingConventions/Darcs

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions

    v26 v27  
    6868If you are working on a feature that you think you think is a candidate for including in GHC's main repository, you may want to talk to us while you are developing it.  We may well, for example, have advice about how to structure the change in a way that we're happy to incorporate in our code base. 
    6969 
    70 == The stable branch == 
    71  
    72 The preferred way to make a change to the stable branch is to first record it on the HEAD, 
    73 with a note in the commit message that it should be merged. You can then also push it to the 
    74 stable branch if you wish, or you can leave it for the stable branch maintainer to do. 
    75  
    76 Sometimes it is not possible to push the HEAD patch to the stable branch, as it may depend on 
    77 other patches that are meant only for the HEAD. In this case the changes will need to be remade 
    78 in the stable branch. The commit message for this new change should include the entire commit 
    79 message of the original change, prefaced with `"MERGED: "`. 
    80 The same patch should be pushed to both branches whenever possible, though, as it makes it 
    81 easier to compare the two branches. 
    82  
    83 If you first fix a problem in the stable branch then please do apply it only to that branch 
    84 rather than leaving it lying around for when you have time to make the HEAD patch. 
    85  
    8670== Guidelines for people with commit permissions == 
    8771