Changes between Version 1 and Version 2 of Design/VersionControlSystem


Ignore:
Timestamp:
Oct 21, 2008 3:07:55 AM (7 years ago)
Author:
simonpj
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Design/VersionControlSystem

    v1 v2  
    1313 
    1414   * Each Boot Library will 
    15       (a) either be mastered in Git, with a read-only Darcs mirror 
    16       (b) or be mastered in Darcs, with a read-only Git mirror 
    17       (c) or be mastered in Darcs, with an occasional, manual process to copy a snapshot of the library from Darcs into GHC's Git repo.  (Those Git files should be considered read-only.) 
     15     * (a)either be mastered in Git, with a read-only Darcs mirror 
     16     * (b) or be mastered in Darcs, with a read-only Git mirror 
     17     * (c) or be mastered in Darcs, with an occasional, manual process to copy a snapshot of the library from Darcs into GHC's Git repo.  (Those Git files should be considered read-only.) 
    1818 
    1919   * That means that if we want to modify a Darcs-mastered library we'll have to get the Darcs version, make the patch, test it, push it, and then the Git mirror will be right.  Inconvenient,     but we can live with that.  We might even arrange it to be possible for super-developers to use the Darcs repo (rather than the mirror) direct from their tree.  Ordinary developers can continue to be Git-only. 
     
    2424   * Which is which will be decided on a case-by-case basis.  The main criterion is: is GHC a passive client of the library, which is maintained by someone else (e.g. Cabal, containers), or is the library intimately coupled with GHC's inner workings (e.g. template-haskell)? 
    2525 
    26      If in doubt we should resolve ties in favour of darcs; we can always change our minds later, but changing and then changing back would be silly. 
     26   If in doubt we should resolve ties in favour of darcs; we can always change our minds later, but changing and then changing back would be silly. 
    2727 
    2828   * Our specific proposals for the master VCS for each boot library are: 
     
    5757Of these, probably the only contentious one is `base`, which is both very tightly coupled to GHC, but also used by nhc and Hugs.  We humbly beg indulgence from Malcolm and Ross, and hope that the Darcs mirror be acceptable.  They have kindly offered such indulgence! 
    5858 
    59 However, `array`, `process`, `unix`, `Win32` are also somewhat less obvious, but they 
    60   are quite intimately connected to GHC 
     59However, `array`, `process`, `unix`, `Win32` are also somewhat less obvious, but they are quite intimately connected to GHC