Fixing a bunch of ocaml issues at once

[Perry E. Metzger]

I've now done what I think is a proper pull request.

If someone can verify for me that I did the thing right:

https://github.com/macports/macports-ports/pull/1044

Perry

(I kept the post history below for context.)


On Sat, 18 Nov 2017 17:17:24 -0800 (PST) Fred Wright <fw at fwright.net>
wrote:
> On Sat, 18 Nov 2017, Perry E. Metzger wrote:
> 
> > So https://github.com/pmetzger/macports-ports/tree/ocaml-update
> > has a bunch of fixes that bring the ocaml port up to 4.05, create
> > a separate package for ocamlbuild (which was spun out of the main
> > ocaml after the last version in macports), updates camlp4 and
> > camlp5 as needed, fixes our very backrev findlib (without which
> > you can't build a bunch of things), and as a sort of test, brings
> > the coq port up to 8.7.0 (it was languishing) -- it builds fine
> > with all these updates in place.
> >
> > My problem is that I didn't really know what I was doing and my
> > commit messages on my ocaml-update branch are not really up to
> > standard. I realized this when I tried doing a pull request and
> > saw the form asked if they were.
> >
> > What should I do from here to get this stuff committed?  
> 
> You can update the commit messages with interactive rebase (git
> rebase -i), and then force-push the updated branch to your fork.
> 
> If you do a "git rebase -i master ocaml-update", it will put you in
> the editor with a list of the new commits (in *forward*
> chronological order), each prefixed by 'pick'.  Replace 'pick' by
> 'reword' for any commit whose message you want to update, then save
> and quit.  It will then put you in the editor for the first commit
> message to be updated.  Update the text, save, and quit, repeating
> for all the commits you flagged.  Then force-push the branch ("git
> push -f") to your fork.
> 
> If you only need to update the single most recent commit on the
> current branch, you can just use "git commit --amend" instead of
> interactive rebase.
> 
> There does seem to be a bug in GitHub related to this sort of thing,
> though.  Recently I created a pull request, and in the process
> noticed a minor problem with the commit message.  Since there's no
> 'Cancel' button for PRs, I just closed the page.  After updating
> and re-pushing the commit, the PR page came up with the *old*
> commit message, presumably due to some unwanted cacheing.  I worked
> around it by going to the Compare page and then using the PR button
> from there.  Though I expect that merging the PR would have used
> the correct commit message, and only the PR text would have been
> incorrect.
> 
> Fred Wright
> 



-- 
Perry E. Metzger		perry at piermont.com