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

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

Issue 10981034: Fix silently failing branch merge script on Mac (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 | « no previous file | 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 let CURRENT_STEP+=1 199 let CURRENT_STEP+=1
200 if [ $START_STEP -le $CURRENT_STEP ] ; then 200 if [ $START_STEP -le $CURRENT_STEP ] ; then
201 echo ">>> Step $CURRENT_STEP: Increment version number." 201 echo ">>> Step $CURRENT_STEP: Increment version number."
202 restore_if_unset "PATCH" 202 restore_if_unset "PATCH"
203 NEWPATCH=$(($PATCH + 1)) 203 NEWPATCH=$(($PATCH + 1))
204 confirm "Automatically increment PATCH_LEVEL? (Saying 'n' will fire up \ 204 confirm "Automatically increment PATCH_LEVEL? (Saying 'n' will fire up \
205 your EDITOR on $VERSION_FILE so you can make arbitrary changes. When \ 205 your EDITOR on $VERSION_FILE so you can make arbitrary changes. When \
206 you're done, save the file and exit your EDITOR.)" 206 you're done, save the file and exit your EDITOR.)"
207 if [ $? -eq 0 ] ; then 207 if [ $? -eq 0 ] ; then
208 sed -e "/#define PATCH_LEVEL/s/[0-9]*$/$NEWPATCH/" \ 208 sed -e "/#define PATCH_LEVEL/s/[0-9]*$/$NEWPATCH/" \
209 -i "$VERSION_FILE" 209 -i.bak "$VERSION_FILE" || die "Could not increment patch level"
210 else 210 else
211 $EDITOR "$VERSION_FILE" 211 $EDITOR "$VERSION_FILE"
212 fi 212 fi
213 read_and_persist_version "NEW" 213 read_and_persist_version "NEW"
214 fi 214 fi
215 215
216 let CURRENT_STEP+=1 216 let CURRENT_STEP+=1
217 if [ $START_STEP -le $CURRENT_STEP ] ; then 217 if [ $START_STEP -le $CURRENT_STEP ] ; then
218 echo ">>> Step $CURRENT_STEP: Commit to local branch." 218 echo ">>> Step $CURRENT_STEP: Commit to local branch."
219 git commit -a -F "$COMMITMSG_FILE" \ 219 git commit -a -F "$COMMITMSG_FILE" \
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 restore_if_unset "TO_URL" 271 restore_if_unset "TO_URL"
272 restore_if_unset "REVISION_LIST" 272 restore_if_unset "REVISION_LIST"
273 restore_version_if_unset "NEW" 273 restore_version_if_unset "NEW"
274 common_cleanup 274 common_cleanup
275 echo "*** SUMMARY ***" 275 echo "*** SUMMARY ***"
276 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" 276 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH"
277 echo "branch: $TO_URL" 277 echo "branch: $TO_URL"
278 echo "svn revision: $SVN_REVISION" 278 echo "svn revision: $SVN_REVISION"
279 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" 279 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST"
280 fi 280 fi
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698