Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: tools/merge-to-branch.sh

Issue 11031065: push-to-trunk.sh/merge-to-branch.sh: use "git apply" instead of "patch" to apply patches (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « tools/common-includes.sh ('k') | tools/push-to-trunk.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 restore_patch_commit_hashes_if_unset "PATCH_COMMIT_HASHES" 179 restore_patch_commit_hashes_if_unset "PATCH_COMMIT_HASHES"
180 rm -f "$TOUCHED_FILES_FILE" 180 rm -f "$TOUCHED_FILES_FILE"
181 for HASH in ${PATCH_COMMIT_HASHES[@]} ; do 181 for HASH in ${PATCH_COMMIT_HASHES[@]} ; do
182 echo "Applying patch for $HASH to $MERGE_TO_BRANCH..." 182 echo "Applying patch for $HASH to $MERGE_TO_BRANCH..."
183 git log -1 -p $HASH > "$TEMPORARY_PATCH_FILE" 183 git log -1 -p $HASH > "$TEMPORARY_PATCH_FILE"
184 apply_patch "$TEMPORARY_PATCH_FILE" 184 apply_patch "$TEMPORARY_PATCH_FILE"
185 done 185 done
186 if [ -n "$EXTRA_PATCH" ] ; then 186 if [ -n "$EXTRA_PATCH" ] ; then
187 apply_patch "$EXTRA_PATCH" 187 apply_patch "$EXTRA_PATCH"
188 fi 188 fi
189 stage_files
190 fi 189 fi
191 190
192 let CURRENT_STEP+=1 191 let CURRENT_STEP+=1
193 if [ $START_STEP -le $CURRENT_STEP ] ; then 192 if [ $START_STEP -le $CURRENT_STEP ] ; then
194 echo ">>> Step $CURRENT_STEP: Prepare $VERSION_FILE." 193 echo ">>> Step $CURRENT_STEP: Prepare $VERSION_FILE."
195 # These version numbers are used again for creating the tag 194 # These version numbers are used again for creating the tag
196 read_and_persist_version 195 read_and_persist_version
197 fi 196 fi
198 197
199 let CURRENT_STEP+=1 198 let CURRENT_STEP+=1
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 restore_if_unset "TO_URL" 271 restore_if_unset "TO_URL"
273 restore_if_unset "REVISION_LIST" 272 restore_if_unset "REVISION_LIST"
274 restore_version_if_unset "NEW" 273 restore_version_if_unset "NEW"
275 common_cleanup 274 common_cleanup
276 echo "*** SUMMARY ***" 275 echo "*** SUMMARY ***"
277 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" 276 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH"
278 echo "branch: $TO_URL" 277 echo "branch: $TO_URL"
279 echo "svn revision: $SVN_REVISION" 278 echo "svn revision: $SVN_REVISION"
280 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" 279 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST"
281 fi 280 fi
OLDNEW
« no previous file with comments | « tools/common-includes.sh ('k') | tools/push-to-trunk.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698