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

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

Issue 138963006: Fix tree check in merge-to-branch script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 11 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 upload_step 237 upload_step
238 238
239 let CURRENT_STEP+=1 239 let CURRENT_STEP+=1
240 if [ $START_STEP -le $CURRENT_STEP ] ; then 240 if [ $START_STEP -le $CURRENT_STEP ] ; then
241 echo ">>> Step $CURRENT_STEP: Commit to the repository." 241 echo ">>> Step $CURRENT_STEP: Commit to the repository."
242 restore_if_unset "MERGE_TO_BRANCH" 242 restore_if_unset "MERGE_TO_BRANCH"
243 git checkout $BRANCHNAME \ 243 git checkout $BRANCHNAME \
244 || die "cannot ensure that the current branch is $BRANCHNAME" 244 || die "cannot ensure that the current branch is $BRANCHNAME"
245 wait_for_lgtm 245 wait_for_lgtm
246 PRESUBMIT_TREE_CHECK="skip" git cl dcommit \ 246 PRESUBMIT_TREE_CHECK="skip" git cl presubmit \
247 || die "presubmit failed"
248 PRESUBMIT_TREE_CHECK="skip" git cl dcommit --bypass-hooks \
247 || die "failed to commit to $MERGE_TO_BRANCH" 249 || die "failed to commit to $MERGE_TO_BRANCH"
248 fi 250 fi
249 251
250 let CURRENT_STEP+=1 252 let CURRENT_STEP+=1
251 if [ $START_STEP -le $CURRENT_STEP ] && [ $REVERT_FROM_BLEEDING_EDGE -eq 0 ] ; t hen 253 if [ $START_STEP -le $CURRENT_STEP ] && [ $REVERT_FROM_BLEEDING_EDGE -eq 0 ] ; t hen
252 echo ">>> Step $CURRENT_STEP: Determine svn commit revision" 254 echo ">>> Step $CURRENT_STEP: Determine svn commit revision"
253 restore_if_unset "NEW_COMMIT_MSG" 255 restore_if_unset "NEW_COMMIT_MSG"
254 restore_if_unset "MERGE_TO_BRANCH" 256 restore_if_unset "MERGE_TO_BRANCH"
255 git svn fetch || die "'git svn fetch' failed." 257 git svn fetch || die "'git svn fetch' failed."
256 COMMIT_HASH=$(git log -1 --format=%H --grep="$NEW_COMMIT_MSG" \ 258 COMMIT_HASH=$(git log -1 --format=%H --grep="$NEW_COMMIT_MSG" \
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 restore_version_if_unset "NEW" 290 restore_version_if_unset "NEW"
289 common_cleanup 291 common_cleanup
290 if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then 292 if [ $REVERT_FROM_BLEEDING_EDGE==0 ] ; then
291 echo "*** SUMMARY ***" 293 echo "*** SUMMARY ***"
292 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" 294 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH"
293 echo "branch: $TO_URL" 295 echo "branch: $TO_URL"
294 echo "svn revision: $SVN_REVISION" 296 echo "svn revision: $SVN_REVISION"
295 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" 297 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST"
296 fi 298 fi
297 fi 299 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