Changes between Version 35 and Version 36 of Repositories


Ignore:
Timestamp:
Nov 25, 2012 8:46:52 PM (3 years ago)
Author:
igloo
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Repositories

    v35 v36  
    3636The mirrors are updated automatically each night, but you can force an immediate update by running `/srv/darcs/do_mirrors` on `darcs.haskell.org`.
    3737
    38 == When the master repo is in Git ==
     38== Making changes to repositories ==
    3939
    40 If the master (upstream) repo is in Git (eg `containers`), you can use the following workflow:
    41  1. Push the change to the upstream repo `//github.com/haskell/containers.git`
    42  2. Push the change to the validated GHC repo for `containers`, namely `darcs.haskell.org:/srv/darcs/packages/containers.git`.
    43 
    44 In other words, you don't need to interact with the git mirror on `darcs.haskell.org`. It is ''only'' there so that in step (2), the push script can check that the patch you are pushing is in the mirror, thereby ensuring that we always lag the master repo.  (For some reason this is hard to do directly on the master.)
    45 
    46 Note step 2 will fail until the mirror has been updated.
    47 
    48 == When the master repo is in Darcs ==
    49 
    50 Things are a bit more complicated when the master repo is in Darcs.  For example, to make a change to bytestring:
    51 
    52  1. First push the change as a darcs patch to the upstream bytestring repository, http://darcs.haskell.org/bytestring/
    53  2. The patch will be mirrored and converted to git by the mirror script, in the repo http://darcs.haskell.org/git-mirrors/bytestring/.git/
    54  3. You then need to pull from http://darcs.haskell.org/git-mirrors/bytestring/.git/ into `libraries/bytestring` in a regular GHC tree, validate, and push to the GHC bytestring repo, `darcs.haskell.org:/srv/darcs/packages/bytestring.git`.
     40See [wiki:WorkingConventions/Repositories].
    5541
    5642== Repository locations ==