<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">Merging Haddock into GHC’s subtree would undoubtedly simplify the GHC workflow for patches affecting Haddock. There are a couple other considerations though:</div><div class=""><ul class=""><li class="">Haddock currently sees the bulk of its contributions and bug fixes on its stable branches, not the <font face="Menlo" class="">ghc-head</font> branch (which is the one GHC tracks). Not only is this exactly the opposite of GHC, but it also makes outside contributions and CI much simpler.</li><li class="">The Haddock project is actually 3 packages, two of which are libraries, one of which is expected to build on GHC going all the way back to the 7.4.* series. AFAICT, the packages kept in GHC’s source tree usually advance in lockstep with GHC.</li><li class="">Running the full GHC CI for most of Haddock’s changes seems a waste of resources and an unnecessary delay. Besides, Haddock actually has a larger test suite, which is only expected to compile on the stable branch (although I try to keep it running on <font face="Menlo" class="">ghc-head</font> with the help of head.hackage). I recently incorporated the other part of Haddock’s testsuite into GHC’s testsuite, so I’m hoping there will be less breakage coming from <font face="Menlo" class="">ghc-head</font>.</li><li class="">Interleaving git histories would (mostly) just make bisecting both GHC and Haddock more of a pain.</li></ul><div class="">The right way to solve this problem is probably to find a better way of factoring GHC-specific functionality out and putting only that in the GHC tree. This is a good long term goal, but I don’t think we are quite there yet. Some other ongoing changes in both GHC and Haddock are blocking the way forward on this front…</div></div><div class=""><br class=""></div><div class="">Thanks,</div><div class="">Alec</div><div class=""><br class=""></div><div><blockquote type="cite" class=""><div class="">On Mar 6, 2019, at 1:26 PM, Boespflug, Mathieu <<a href="mailto:m@tweag.io" class="">m@tweag.io</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">If the status quo is poor, then why not merge the two? git-subtree won't fix the problem and will arguably be even harder to manage than submodules.<div class=""><br class=""></div><div class="">Best,</div></div><br class=""><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 6 Mar 2019 at 15:59, Ben Gamari <<a href="mailto:ben@smart-cactus.org" class="">ben@smart-cactus.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Sylvain Henry <<a href="mailto:sylvain@haskus.fr" target="_blank" class="">sylvain@haskus.fr</a>> writes:<br class="">
<br class="">
> Why don't we just put Haddock into GHC's repository? It was proposed in <br class="">
> a previous discussion in February [1] and it would avoid the bad <br class="">
> experience of having it as a submodule while keeping it in sync.<br class="">
><br class="">
I'm reluctant to keep it in the GHC tree; it really is a separate<br class="">
project with separate maintainership, dependencies, and contributors.<br class="">
<br class="">
That being said, I do agree that the status quo is pretty poor. I was<br class="">
going to suggest managing it with git-subtree instead, but I'm not sure<br class="">
this would be much of an improvement.<br class="">
<br class="">
Cheers,<br class="">
<br class="">
- Ben<br class="">
_______________________________________________<br class="">
ghc-devs mailing list<br class="">
<a href="mailto:ghc-devs@haskell.org" target="_blank" class="">ghc-devs@haskell.org</a><br class="">
<a href="http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs" rel="noreferrer" target="_blank" class="">http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs</a><br class="">
</blockquote></div>
_______________________________________________<br class="">ghc-devs mailing list<br class=""><a href="mailto:ghc-devs@haskell.org" class="">ghc-devs@haskell.org</a><br class="">http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs<br class=""></div></blockquote></div><br class=""></body></html>