Changes between Version 14 and Version 15 of WorkingConventions/Git


Ignore:
Timestamp:
Aug 25, 2011 9:19:37 AM (4 years ago)
Author:
simonmar
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingConventions/Git

    v14 v15  
    6161(1) is more for "back to the drawing board" kinds of failure, whereas (2) is for cases where you just need to fix a warning or some other minor error exposed by validate.
    6262
    63 == Setting up the trees ==
     63=== Setting up the trees ===
    6464
    6565Let's call the two trees `ghc-working` and `ghc-validate`.
     
    8484Now you have `ghc-working` and `ghc-validate` repos, and additionally the `ghc-validate` repo tree is set up with a remote `working` pointing to the `ghc-working` tree, and pushing from `ghc-validate` will push changes via SSH to `darcs.haskell.org`.
    8585
    86 == The rebase workflow ==
     86=== The rebase workflow ===
    8787
    8888How do we move patches from `ghc-working` and `ghc-validate`?  There are several options here.  One is to just use `sync-all pull working` and do merging as usual.  This works fine, but results in extra "merge commits" that aren't particularly helpful and clutter the commit logs and the mailing list.  A better approach is to rebase patches before committing.  This is done as follows: