Reverting disaster merge to 593363c5f with diff #2172
Merged
Conversation
This file contains 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
There was a disaster of a merge at 6f37cf2 that is particularly difficult to untangle (it was a bad merge from a long-running local branch). What this commit does is simulate a hard reset, by doing thing: git checkout -b reset-hard-ohmu git reset --hard 593363c git checkout upstream-master git checkout -b revert-via-diff git diff --no-prefix upstream-master..reset-hard-ohmy > patch patch -p0 < patch Since there was one binary change, also did this: git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf Now we have one commit that puts everything back. It screws up file-level history a little, but it's at least at a point where we can move on with our lives. Sorry.
|
Hey @bturner-r7, do you have any opinion on this remedy? It seemed too daunting to revert each commit, but maybe I'm missing some syntax. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
There was a disaster of a merge at 6f37cf2 that is particularly
difficult to untangle (it was a bad merge from a long-running local
branch).
What this commit does is simulate a hard reset, by doing this:
git checkout -b reset-hard-ohmy
git reset --hard 593363c
git checkout upstream-master
git checkout -b revert-via-diff
git diff --no-prefix upstream-master..reset-hard-ohmy > patch
patch -p0 < patch
Since there was one binary change, also did this:
git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf
Now we have one commit that puts everything back. It screws up
file-level history a little, but it's at least at a point where we can
move on with our lives. Sorry.
Updated with actually pulling in the prior version of CVE-2013-1535's Main.swf and @kholia's module from #2168