OLD | NEW |
1 #!/bin/bash | 1 #!/bin/bash |
2 # Copyright 2012 the V8 project authors. All rights reserved. | 2 # Copyright 2012 the V8 project authors. All rights reserved. |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following | 10 # copyright notice, this list of conditions and the following |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 persist "NEW_COMMIT_MSG" | 228 persist "NEW_COMMIT_MSG" |
229 persist "REVISION_LIST" | 229 persist "REVISION_LIST" |
230 persist_patch_commit_hashes | 230 persist_patch_commit_hashes |
231 fi | 231 fi |
232 | 232 |
233 let CURRENT_STEP+=1 | 233 let CURRENT_STEP+=1 |
234 if [ $START_STEP -le $CURRENT_STEP ] ; then | 234 if [ $START_STEP -le $CURRENT_STEP ] ; then |
235 echo ">>> Step $CURRENT_STEP: Apply patches for selected revisions." | 235 echo ">>> Step $CURRENT_STEP: Apply patches for selected revisions." |
236 restore_if_unset "MERGE_TO_BRANCH" | 236 restore_if_unset "MERGE_TO_BRANCH" |
237 restore_patch_commit_hashes_if_unset "PATCH_COMMIT_HASHES" | 237 restore_patch_commit_hashes_if_unset "PATCH_COMMIT_HASHES" |
238 rm -f "$TOUCHED_FILES_FILE" | |
239 for HASH in ${PATCH_COMMIT_HASHES[@]} ; do | 238 for HASH in ${PATCH_COMMIT_HASHES[@]} ; do |
240 echo "Applying patch for $HASH to $MERGE_TO_BRANCH..." | 239 echo "Applying patch for $HASH to $MERGE_TO_BRANCH..." |
241 git log -1 -p $HASH > "$TEMPORARY_PATCH_FILE" | 240 git log -1 -p $HASH > "$TEMPORARY_PATCH_FILE" |
242 apply_patch "$TEMPORARY_PATCH_FILE" | 241 apply_patch "$TEMPORARY_PATCH_FILE" |
243 done | 242 done |
244 if [ -n "$EXTRA_PATCH" ] ; then | 243 if [ -n "$EXTRA_PATCH" ] ; then |
245 apply_patch "$EXTRA_PATCH" | 244 apply_patch "$EXTRA_PATCH" |
246 fi | 245 fi |
247 fi | 246 fi |
248 | 247 |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 restore_version_if_unset "NEW" | 333 restore_version_if_unset "NEW" |
335 common_cleanup | 334 common_cleanup |
336 if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then | 335 if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then |
337 echo "*** SUMMARY ***" | 336 echo "*** SUMMARY ***" |
338 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" | 337 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" |
339 echo "branch: $TO_URL" | 338 echo "branch: $TO_URL" |
340 echo "svn revision: $SVN_REVISION" | 339 echo "svn revision: $SVN_REVISION" |
341 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" | 340 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" |
342 fi | 341 fi |
343 fi | 342 fi |
OLD | NEW |