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

Side by Side Diff: tools/push-to-trunk.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/merge-to-branch.sh ('k') | no next file » | 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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 echo ">>> Step $CURRENT_STEP: Create a new branch from trunk." 261 echo ">>> Step $CURRENT_STEP: Create a new branch from trunk."
262 git checkout -b $TRUNKBRANCH svn/trunk \ 262 git checkout -b $TRUNKBRANCH svn/trunk \
263 || die "Checking out a new branch '$TRUNKBRANCH' failed." 263 || die "Checking out a new branch '$TRUNKBRANCH' failed."
264 fi 264 fi
265 265
266 let CURRENT_STEP+=1 266 let CURRENT_STEP+=1
267 if [ $START_STEP -le $CURRENT_STEP ] ; then 267 if [ $START_STEP -le $CURRENT_STEP ] ; then
268 echo ">>> Step $CURRENT_STEP: Apply squashed changes." 268 echo ">>> Step $CURRENT_STEP: Apply squashed changes."
269 rm -f "$TOUCHED_FILES_FILE" 269 rm -f "$TOUCHED_FILES_FILE"
270 apply_patch "$PATCH_FILE" 270 apply_patch "$PATCH_FILE"
271 stage_files
272 rm -f "$PATCH_FILE" 271 rm -f "$PATCH_FILE"
273 fi 272 fi
274 273
275 let CURRENT_STEP+=1 274 let CURRENT_STEP+=1
276 if [ $START_STEP -le $CURRENT_STEP ] ; then 275 if [ $START_STEP -le $CURRENT_STEP ] ; then
277 echo ">>> Step $CURRENT_STEP: Set correct version for trunk." 276 echo ">>> Step $CURRENT_STEP: Set correct version for trunk."
278 restore_version_if_unset 277 restore_version_if_unset
279 sed -e "/#define MAJOR_VERSION/s/[0-9]*$/$MAJOR/" \ 278 sed -e "/#define MAJOR_VERSION/s/[0-9]*$/$MAJOR/" \
280 -e "/#define MINOR_VERSION/s/[0-9]*$/$MINOR/" \ 279 -e "/#define MINOR_VERSION/s/[0-9]*$/$MINOR/" \
281 -e "/#define BUILD_NUMBER/s/[0-9]*$/$BUILD/" \ 280 -e "/#define BUILD_NUMBER/s/[0-9]*$/$BUILD/" \
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 update the v8rel spreadsheet:" 402 update the v8rel spreadsheet:"
404 else 403 else
405 echo "Congratulations, you have successfully created the trunk revision \ 404 echo "Congratulations, you have successfully created the trunk revision \
406 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \ 405 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \
407 Chromium, and to update the v8rel spreadsheet:" 406 Chromium, and to update the v8rel spreadsheet:"
408 fi 407 fi
409 echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION" 408 echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION"
410 common_cleanup 409 common_cleanup
411 [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH 410 [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH
412 fi 411 fi
OLDNEW
« no previous file with comments | « tools/merge-to-branch.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698