Skip to content

Rebase of #1617 (make string/bytes distinguishable in bytecode)#1659

Merged
nojb merged 10 commits intoocaml:trunkfrom
nojb:safe-string2
Mar 15, 2018
Merged

Rebase of #1617 (make string/bytes distinguishable in bytecode)#1659
nojb merged 10 commits intoocaml:trunkfrom
nojb:safe-string2

Conversation

@nojb
Copy link
Copy Markdown
Contributor

@nojb nojb commented Mar 14, 2018

This is a rebase of #1617 with the bootstrap commits re-done (it does not seem possible to push to the existing PR).

@dra27
Copy link
Copy Markdown
Member

dra27 commented Mar 14, 2018

I'm not sure if I've got the house rule right, but I thought it's more that a core dev needs to repeat the bootstrap and verify that the binary in the GPR is the same (@xavierleroy?)

@nojb
Copy link
Copy Markdown
Contributor Author

nojb commented Mar 14, 2018

In this case, the GPR needs to be rebased in order to be mergeable - so the GPR author would have had to rebase the PR, redoing the bootstraps and then a core dev would have needed to re-do the re-done bootstraps to check that they are the same. Seems a bit inefficient.

@hhugo
Copy link
Copy Markdown
Contributor

hhugo commented Mar 15, 2018

@nojb, thanks for the rebase. Unfortunately, it needs to be rebased again.

@nojb
Copy link
Copy Markdown
Contributor Author

nojb commented Mar 15, 2018

Thanks, will update shortly.

@nojb
Copy link
Copy Markdown
Contributor Author

nojb commented Mar 15, 2018

Rebased. I will merge by end-of-day unless someone speaks up.

@hhugo
Copy link
Copy Markdown
Contributor

hhugo commented Mar 15, 2018

Is it end-of-day already ? :)

@nojb
Copy link
Copy Markdown
Contributor Author

nojb commented Mar 15, 2018

Yes, will merge as soon as the CI is green. Sorry for the wait, but I had to rebase once again due to some recently merged PR.

@nojb nojb merged commit 30fc788 into ocaml:trunk Mar 15, 2018
@nojb
Copy link
Copy Markdown
Contributor Author

nojb commented Mar 15, 2018

Merged, thank you!

@nojb nojb deleted the safe-string2 branch March 15, 2018 19:43
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants