Skip to content

Manifest (14): update for recent changes

Romain requested to merge nomadic-labs/tezos:romain-manifest-step-14-opam into master

Context

!3366 (merged) is being reviewed, but it takes time, and as time goes on, the difference between master and the manifest-generated dune and .opam files increase. The difference is now big enough that rebasing is starting to be a pain. So I make this MR to catch up and reduce the diff.

General Review Tips

I left comments in the MR to explain some of the changes. I suggest you read them first.

patdiff helps a lot, as well as the -w option of git diff. You can use patdiff with git diff as follows:

opam install patdiff
export GIT_EXTERNAL_DIFF=`pwd`/_opam/bin/patdiff-git-wrapper

If you read the diff in GitLab, the -w option of git diff can be activated by opening preferences (the gear icon while reviewing) and unchecking "show whitespace changes".

Apparently, VS Code is also very nice to review whitespace diffs.

Manually testing the MR

Compile everything (or let the CI do it for you).

Checklist

  • Select suitable reviewers using the Reviewers field below.
  • Select as Assignee the next person who should take action on that MR

Merge request reports