Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0.4 backported commits #3805

Merged
merged 28 commits into from Apr 2, 2019

Conversation

Projects
None yet
9 participants
@rjbou
Copy link
Collaborator

rjbou commented Mar 27, 2019

Backported commits for 2.0.4 release.

commit iss pr descr
fee312c #3706 Add (rudimentary) error handling to make man
4fff3d1 #3576 #3597 Sandboxing on MacOS: considering the possibility that TMPDIR in unset
551de1a - c392669 - 328c259 #3717 #3723 Fix variable display
ca7de52 #3651 #3726 pin: update source of (version) pinned directory
e75c13d #3731 Fix small misspellings
b946497 #3736 Fix --ignore-pin-depends with autopin
3105791 #3732 opam clean: Ignore errors trying to remove directories
14d43fb #3744 mismatching extra-files: sort list before comparing them
9f21da9 #3748 travis: update opam test
49d38bc #3754 fix hg opam 1.2 url parsing
39d0157 #3738 #3753 lint: warning error 47 on descr first line
28c339e - e13ee06 #3541 lock & signals, don't interrupt at non terminal signals
cc79400 - 9410650 - ac61581 #3671 #3728 fix fish manpath setting
d07ca90 #3627 #3788 use git -c diff.noprefix=false diff
25d98d3 #3796 dirtrack: missing to_hex conversion
b7807bf #3801 travis: remove no-ocamlbuild option for 4.02.3
f08c156 #3727 #3800 Fix pinnings not installing/upgrading already pinned packages (introduced in 2.0.2)
@AltGr

This comment has been minimized.

Copy link
Member

AltGr commented Mar 28, 2019

Thanks ! 👍
Tests fail because opam-rt no longer compiles on the 2.0 branch

rjbou and others added some commits Sep 10, 2018

lock: don't interrupt at non terminal signals
Signals like SIGWINCH (window resize) interrupt a blocking lock.
Revert "Correct unnecessary alternation in URL parser" (#3754)
This reverts commit 7db852f.
This is needed to parse old hg url format: `hg://https://...` is wrongly translated to `hg+ssh://https//...` instead of `hg+https://...`
Fix #3627: use git -c diff.noprefix=false diff (#3788)
Fix #3627 by ensuring git produces a `-p1` diff. This is a very limited
fix but appears to work in my usecase. I have reviewed the other uses of
`git diff` in the same file, but it appears their output is not passed
to `patch` hence this change is unnecessary.

@rjbou rjbou force-pushed the rjbou:2.0.4 branch from ed13264 to d224796 Mar 28, 2019

@avsm

This comment has been minimized.

Copy link
Member

avsm commented Mar 29, 2019

All these lgtm!

@AltGr AltGr merged commit d687193 into ocaml:2.0 Apr 2, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@hannesm

This comment has been minimized.

Copy link
Member

hannesm commented Apr 11, 2019

thanks for the release, PR'ed to FreeBSD ports https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237202

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.