-
Notifications
You must be signed in to change notification settings - Fork 43
Conversation
This reverts commit e563b76.
Thank you for this PR! Rather than merge the new version into the old, could you rebase the repo on top of the new version? Similar to #2. Thank you! |
OK, we can do that if that's what it takes to get accepted, but why on Earth would you want that? This does, however, explain why we got merge conflicts out of nowhere when we were trying to submit our PR. |
We have a few commits to adapt AFL, and they're done on top of the AFL source code. If those commits are rebased when each new version of AFL is released, then the commit log makes sense. Otherwise, it becomes a nightmarish graph of merge conflict resolutions, and our actual modifications are lost in the chaos. The current graph of commits shows the optimal solution: https://github.com/shellphish/afl-other-arch/commits/master Basically, best-case scenario, the "update AFL to 2.52b" commit would go between 9263d45 and d04ba73. |
New pull request submitted. It won't merge cleanly, but I think this is what you wanted. |
Was actually going to look into this exact thing. What needs to be done to get this updated to a non-archaic version of afl? |
Years later, this can be closed! This repo has been obsoleted by build process updates in shellphish-afl. |
Get ready for an incredible contribution:
Resolves shellphish/shellphish-afl#8 :-)
Will also require a PR to shellphish-afl to patch up the eflload patch.