Changes between Version 4 and Version 5 of WorkingConventions


Ignore:
Timestamp:
Oct 26, 2006 7:33:37 AM (8 years ago)
Author:
simonmar
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions

    v4 v5  
    3030 * Try to make small patches (i.e. work in consistent increments). 
    3131 
     32 * Separate changes that affect functionality from those that just affect 
     33   code layout, indendation, whitespace, filenames etc.  This means that 
     34   when looking at patches later, we don't have to wade through loads of 
     35   non-functional changes to get to the important parts of the patch.    
     36 
    3237 * If possible, push often.  This helps to avoid conflicts. 
    3338 
    3439 * Rather than push conflicting patches followed by conflict resolutions, use 
    35    amend-record to make a single patch.  Darcs currently doesn't handle conflicts 
     40   amend-record (or unrecord/edit/record) to make a single patch.  Darcs currently 
     41   doesn't handle conflicts 
    3642   well, so we are trying to keep the HEAD clean of conflicts for now.  It doesn't 
    3743   matter so much on the stable branches though.