On 31/01/2011 01:21, Manuel M T Chakravarty wrote:
Simon Marlow:
Mon Jan 24 04:16:50 PST 2011 Simon Marlow<[email protected]> *
Merge in new code generator branch. This changes the new code
generator to make use of the Hoopl package for dataflow analysis.
Hoopl is a new boot package, and is maintained in a separate
upstream git repository (as usual, GHC has its own lagging darcs
mirror in http://darcs.haskell.org/packages/hoopl).
During this merge I squashed recent history into one patch. I
tried to rebase, but the history had some internal conflicts of its
own which made rebase extremely confusing, so I gave up.
When you say, you tried to "rebase", does that mean you tried to use
git's rebase feature or you tried something equivalent in darcs?
I was trying the experimental darcs rebase at the time.
http://wiki.darcs.net/Ideas/RebaseStatus
Cheers,
Simon
_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc
