<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <p>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.<br>
    </p>
    <p>With the following commands we can keep the whole commit history:</p>
    <p>In Haddock repo:<br>
      > mkdir -p utils/haddock<br>
      > git rm .arcconfig .arclint .ghci .gitignore .travis.yml<br>
      > git mv -k * utils/haddock<br>
      > git commit -a -m "Prepare Haddock merge"<br>
      <br>
      In GHC repo:<br>
      > git rm -rf utils/haddock<br>
      > git commit -a -m "Prepare Haddock merge"<br>
      > git remote add haddock <a class="moz-txt-link-freetext" href="https://gitlab.haskell.org/ghc/haddock">https://gitlab.haskell.org/ghc/haddock</a><br>
      > git fetch haddock<br>
      > git merge --allow-unrelated-histories haddock/ghc-8.6 -m
      "Merge haddock" <br>
      > git remote remove haddock<br>
    </p>
    <p>[1]
      <a class="moz-txt-link-freetext" href="https://mail.haskell.org/pipermail/ghc-devs/2019-February/017120.html">https://mail.haskell.org/pipermail/ghc-devs/2019-February/017120.html</a></p>
    <p>Cheers,<br>
      Sylvain<br>
    </p>
    <div class="moz-cite-prefix">On 06/03/2019 13:08, Ben Gamari wrote:<br>
    </div>
    <blockquote type="cite" cite="mid:87sgw0qk8b.fsf@smart-cactus.org">
      <pre class="moz-quote-pre" wrap="">Ryan Scott <a class="moz-txt-link-rfc2396E" href="mailto:ryan.gl.scott@gmail.com"><ryan.gl.scott@gmail.com></a> writes:

</pre>
      <blockquote type="cite">
        <pre class="moz-quote-pre" wrap="">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.

</pre>
      </blockquote>
      <pre class="moz-quote-pre" wrap="">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

</pre>
      <br>
      <fieldset class="mimeAttachmentHeader"></fieldset>
      <pre class="moz-quote-pre" wrap="">_______________________________________________
ghc-devs mailing list
<a class="moz-txt-link-abbreviated" href="mailto:ghc-devs@haskell.org">ghc-devs@haskell.org</a>
<a class="moz-txt-link-freetext" href="http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs">http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs</a>
</pre>
    </blockquote>
  </body>
</html>