machenbach@chromium.org
c2cd2083a3
Add merge-to-branch python port.
...
- To ease a line-by-line review, the script is intentionally close to the former bash version
- Disambiguate the existing "-r" option for reviewer in the other scripts
- The options design will be refactored in a follow up CL
TEST=python -m unittest test_scripts.ScriptTest.testMergeToBranch
R=ulan@chromium.org
Review URL: https://codereview.chromium.org/163183004
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19443 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2014-02-18 13:09:14 +00:00
palfia@homejinni.com
fca3f16b46
Add support to automatically search for corresponding architecture ports in merge-to-branch.sh.
...
BUG=
R=jkummerow@chromium.org , plind44@gmail.com
Review URL: https://codereview.chromium.org/152343011
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19163 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2014-02-06 15:34:46 +00:00
machenbach@chromium.org
efbef90acd
Fix tree check in merge-to-branch script.
...
BUG=
R=ulan@chromium.org
Review URL: https://codereview.chromium.org/138963006
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18648 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2014-01-16 14:40:56 +00:00
ulan@chromium.org
0ca890fd83
Add 'LOG=N' line to merge-to-branch.sh to avoid presubmit errors when merging to branch.
...
R=machenbach@chromium.org
Review URL: https://codereview.chromium.org/128223002
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18494 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2014-01-08 14:04:14 +00:00
dslomov@chromium.org
8058a7fd2b
Fix condition in merge-to-branch.sh
...
R=yangguo@chromium.org
Review URL: https://codereview.chromium.org/101973002
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18237 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-12-03 14:30:36 +00:00
yangguo@chromium.org
c04659215a
Add -R option to merge-to-branch script to revert from bleeding_edge.
...
Usage:
tools/merge-to-branch.sh -R 12345 12346
R=machenbach@chromium.org
Review URL: https://codereview.chromium.org/85413004
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18048 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-11-25 12:55:02 +00:00
yangguo@chromium.org
b8534d6a82
Scripts should not care about closed tree when committing.
...
I just got bitten by this when merging to branch.
R=jkummerow@chromium.org , machenbach@chromium.org
BUG=
Review URL: https://codereview.chromium.org/24254005
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16921 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2013-09-24 13:35:45 +00:00
jkummerow@chromium.org
f1d3d734de
push-to-trunk.sh/merge-to-branch.sh: use "git apply" instead of "patch" to apply patches
...
Review URL: https://codereview.chromium.org/11031065
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12663 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-10-05 08:58:02 +00:00
danno@chromium.org
16782af657
Fix silently failing branch merge script on Mac
...
R=jkummerow@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10981034
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12615 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-09-26 11:19:35 +00:00
danno@chromium.org
c12a9ed6f0
Allow a commit message to be specified to merge-to-branch.sh
...
R=jkummerow@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9844015
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11181 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-03-29 07:01:36 +00:00
danno@chromium.org
924b567382
Support reverse patching in merge-to-branch.sh
...
R=jkummerow@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9839056
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11142 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-03-26 11:35:17 +00:00
danno@chromium.org
754264325f
Allow a patch file to be specified to merge-to-branch.sh
...
R=jkummerow@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9835048
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11119 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-03-23 11:54:07 +00:00
jkummerow@chromium.org
a63d1211d3
Fix "already merging" safety check in merge-to-branch.sh
...
R=danno@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9689062
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11031 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-03-13 15:57:31 +00:00
jkummerow@chromium.org
6dd05d9b34
Refactored push-to-trunk.sh and merge-to-branch.sh.
...
Moved common code into tools/common-includes.sh.
Added automated rolling of V8 into Chromium to push-to-trunk.sh.
Review URL: https://chromiumcodereview.appspot.com/9463041
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10976 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-03-09 10:16:00 +00:00
danno@chromium.org
4f56fb5a87
merge-to-branch.sh should correctly handle added/deleted files
...
R=jkummerow@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9315055
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10592 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-02-02 13:51:05 +00:00
danno@chromium.org
a59b2a96fa
Add a script to automatically merge patches to a branch
...
Review URL: https://chromiumcodereview.appspot.com/9298012
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10561 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-01-31 11:17:17 +00:00
