Managing this repository with Git towards the PR at the end

[joaocgreis]

@nodejs/node-chakracore

The objective of this repository is to keep developing Node on ChakraCore, in order to open a pull request on the main Node repository when we agree that it is time.

How will we open the pull request?

• Directly from chakracore-master, using a merge commit to land: This would keep all the merges from master to chakracore-master, all the updates to chakracore and chakrashim, making the review process harder. This would import all development history to master.
• Taking the difference between master and chakracore-master and dividing into easier to review commits: This seems to be what was done for the original PR ( Enable Node.js to run with Microsoft's ChakraCore engine node#4765 ), making the review process much easier. However, it is possible to lose metadata, including authorship of contributions that we eventually receive.

I'd like to start this discussion by suggesting a third alternative: Rebasing the ChakraCore changes on master, instead of using merges. This would give us a clear set of commits to open the pull request with. By using branch names with a date suffix, the rebases could be reviewed with pull requests. Here is a detailed draft: https://gist.github.com/joaocgreis/869eccafda12f77473da , feel free to suggest improvements.

I believe this is closer to what was suggested in nodejs/node#4765 (comment) , giving us a permanent and easy to review way to see what ChakraCore adds. Currently, we cannot easily see what would be used to open the pull request, nor by looking at the commits (because of merges and updates), nor by looking at git diff (because changes have landed that are not to be included).