Changes between Version 12 and Version 13 of WorkingConventions


Ignore:
Timestamp:
Dec 5, 2006 12:20:41 PM (7 years ago)
Author:
igloo
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions

    v12 v13  
    6868Do not forget to {{{darcs record}}} your changes first! 
    6969 
     70== The stable branch == 
     71 
     72The preferred way to make a change to the stable branch is to first record it on the HEAD, 
     73with a note in the commit message that it should be merged. You can then also push it to the 
     74stable branch if you wish, or you can leave it for the stable branch maintainer to do. 
     75 
     76Sometimes it is not possible to push the HEAD patch to the stable branch, as it may depend on 
     77other patches that are meant only for the HEAD. In this case the changes will need to be remade 
     78in the stable branch. The commit message for this new change should include the entire commit 
     79message of the original change, prefaced with `"MERGED: "`. 
     80The same patch should be pushed to both branches whenever possible, though, as it makes it 
     81easier to compare the two branches. 
     82 
     83If you first fix a problem in the stable branch then please do apply it only to that branch 
     84rather than leaving it lying around for when you have time to make the HEAD patch. 
     85 
    7086== Guidelines for people with commit permissions == 
    7187