ulan@chromium.org
9ac3be9670
Wait for resolving conflicts in merge-to-branch script.
...
R=jkummerow@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10939033
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12560 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-09-20 08:02:17 +00:00
jkummerow@chromium.org
0e80df8fa8
Small improvements to push-to-trunk.sh and merge-to-branch.sh.
...
1.) When a back-merged patch applied at an offset, ignore the "Hunk #1 succeeded at ..." lines instead of printing a scary warning.
2.) When push-to-trunk was not called with "-c /path/to/chrome/src", explicitly ask for the path to help discoverability of the feature.
3.) Correctly convert "BUG=chromium:123" to "(Chromium issue 123)" in the pre-made ChangeLog entry.
Review URL: https://chromiumcodereview.appspot.com/10073010
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11321 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-04-13 16:00:31 +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
jkummerow@chromium.org
0bbe8c4fae
Fix FLAG_always_opt and tools/push-to-trunk.sh
...
TEST=tests with --always-opt don't ASSERT; push to trunk workflow works.
Review URL: https://chromiumcodereview.appspot.com/9718035
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11080 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-03-19 10:16:38 +00:00
danno@chromium.org
0ed593df56
Fix bugs in tools/merge-to-branch.sh
...
Fail if patches fail to apply and correctly match branches in delete_branch().
R=jkummerow@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9701102
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11073 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2012-03-16 16:04:01 +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
