Haddock tree spongled

[Sylvain Henry]

Why don't we just put Haddock into GHC's repository? It was proposed in 
a previous discussion in February [1] and it would avoid the bad 
experience of having it as a submodule while keeping it in sync.

With the following commands we can keep the whole commit history:

In Haddock repo:
 > mkdir -p utils/haddock
 > git rm .arcconfig .arclint .ghci .gitignore .travis.yml
 > git mv -k * utils/haddock
 > git commit -a -m "Prepare Haddock merge"

In GHC repo:
 > git rm -rf utils/haddock
 > git commit -a -m "Prepare Haddock merge"
 > git remote add haddock https://gitlab.haskell.org/ghc/haddock
 > git fetch haddock
 > git merge --allow-unrelated-histories haddock/ghc-8.6 -m "Merge haddock"
 > git remote remove haddock

[1] https://mail.haskell.org/pipermail/ghc-devs/2019-February/017120.html

Cheers,
Sylvain

On 06/03/2019 13:08, Ben Gamari wrote:
> Ryan Scott <ryan.gl.scott at gmail.com> writes:
>
>> I do think something is afoot here. The current Haddock submodule commit is
>> at 07f2ca [1], but the ghc-head branch of Haddock is still at commit 8459c6
>> [2]. It would be good if someone could update the ghc-head branch
>> accordingly.
>>
> Indeed. Done.
>
> It would be nice if we had a better way to handle this. Ideally Marge or
> someone similar would land any relevant haddock patches to ghc-head when
> landing a GHC MR.
>
> Cheers,
>
> - Ben
>
>
> _______________________________________________
> ghc-devs mailing list
> ghc-devs at haskell.org
> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-devs/attachments/20190306/23e1dff8/attachment.html>