Reland "Maintain change log file directly on trunk branch in push-to-trunk."
authormachenbach@chromium.org <machenbach@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Sat, 15 Mar 2014 13:06:08 +0000 (13:06 +0000)
committermachenbach@chromium.org <machenbach@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Sat, 15 Mar 2014 13:06:08 +0000 (13:06 +0000)
commitacc2997b525592e97fa58a4c5aec92d4abffccb5
treeec4ffda83694ea9d4c8bf8ea51df0234938edf69
parent2970f43330044e49d7f7a0e809e1da6846a469e5
Reland "Maintain change log file directly on trunk branch in push-to-trunk."

This uses the following approach to modify the trunk change log:
- Calculate the new change log entries
- Apply changes to the bleeding edge change log (this will be removed in a follow up CL)
- Apply the diff between BE and trunk to trunk (this includes the diff of the change log)
- Reset the change log to the version on trunk
- Reapply the new change log entries

R=jarin@chromium.org

Review URL: https://codereview.chromium.org/196473012

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19953 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
tools/push-to-trunk/git_recipes.py
tools/push-to-trunk/push_to_trunk.py
tools/push-to-trunk/test_scripts.py