WARNING: bogus patch pushed

[Ian Lynagh]

On Sat, Aug 16, 2008 at 02:10:14PM +1000, Manuel M T Chakravarty wrote:
> 
> Nobody answered the question that I (implicitly) raised a few times:  
> how do you branch ghc with a mixed use of git and darcs?

Sorry, I didn't realise you were asking that before.

The answer is, the same way that you branch GHC now:

git clone ghc mybranch
cd mybranch
sh sync-all get

> (I don't  
> know too much of git, but AFAIK, it's notion of branches is pretty  
> different of that of darcs).

This doesn't use git's in-tree branching, but that doesn't seem to be
feasible for us anyway.

> And secondly, if this is a devel branch  
> (as opposed to a release branch) how do you merge?

sh sync-all push
or
sh sync-all pull


Thanks
Ian