Fix misalignment issue#156
Closed
Ekleog-NEAR wants to merge 2 commits into
Closed
Conversation
This is the result of: ``` git rm -r . git checkout 2.4.0 -- . ```
Ekleog-NEAR
force-pushed
the
fix-misalignment-issue
branch
from
eba73a7 to
b0e0dd7
Compare
Contributor
|
Rather than resetting the entire tree, I’d vote to just land the 2nd commit on top of the changes already there. I meanwhile cherry-picked the commit in question into the 2.4 branch from which I’ll release 2.4.1. |
Contributor
Author
|
So my thoughts were, this repo will only ever be used for the few changes we’ll need to make for wasmer nowadays, as all new development will be on near-vm; so keeping all the changes we made on top of 2.4 here is only going to be more hassle. Now, an alternative would be to just stop caring about the near-main branch and configure the 2.4 branch as the main branch on this repo? |
Contributor
|
I don't see a ton of value in making 2.4 branch the default, but it can't hurt either, so lets just do that. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport from near/nearcore#9063.
First commit resets the code to the state it was at 2.4.0, to make it possible to fix issues there without importing all the changes from near-vm.
Second commit is the actual backport.
As per near/nearcore#9140, we’ll need to release it once landed so it can make its way into nearcore, before we can bump to rust 1.70.
Given the relative size of the commits, this should probably be rebased onto near-main, and not merged or squashed.