The effect of merging this PR would be to revert the changes introduced on that branch while still keeping a stable history on master (no rebases). If whoever is maintaining the master branch does want to revert this version of the lua-51-testsuite, and does want to keep a stable history on the master branch, then they could consider merging this PR.
If in the future we do more work on the lua-51-testsuite branch and want to merge it again then the solution would be to first revert this revert and then do a new merge for the newer changes:
git revert 07477ee # revert of revert i.e. restore the changes that were reverted
git merge lua-51-testsuite # pull in new changes made since the original merge
This PR reverts the merge of branch
lua-51-testsuiteinto master. This would be one way to achieve what @dibyendumajumdar suggests in https://github.com/LuaJIT/LuaJIT-test-cleanup/issues/8#issuecomment-253138626.The effect of merging this PR would be to revert the changes introduced on that branch while still keeping a stable history on master (no rebases). If whoever is maintaining the master branch does want to revert this version of the lua-51-testsuite, and does want to keep a stable history on the master branch, then they could consider merging this PR.
If in the future we do more work on the
lua-51-testsuitebranch and want to merge it again then the solution would be to first revert this revert and then do a new merge for the newer changes:See How to revert a faulty merge for full details.