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

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

Issue 24254005: Scripts should not care about closed tree when committing. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 3 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 | « PRESUBMIT.py ('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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 222
223 upload_step 223 upload_step
224 224
225 let CURRENT_STEP+=1 225 let CURRENT_STEP+=1
226 if [ $START_STEP -le $CURRENT_STEP ] ; then 226 if [ $START_STEP -le $CURRENT_STEP ] ; then
227 echo ">>> Step $CURRENT_STEP: Commit to the repository." 227 echo ">>> Step $CURRENT_STEP: Commit to the repository."
228 restore_if_unset "MERGE_TO_BRANCH" 228 restore_if_unset "MERGE_TO_BRANCH"
229 git checkout $BRANCHNAME \ 229 git checkout $BRANCHNAME \
230 || die "cannot ensure that the current branch is $BRANCHNAME" 230 || die "cannot ensure that the current branch is $BRANCHNAME"
231 wait_for_lgtm 231 wait_for_lgtm
232 git cl dcommit || die "failed to commit to $MERGE_TO_BRANCH" 232 PRESUBMIT_TREE_CHECK="skip" git cl dcommit \
233 || die "failed to commit to $MERGE_TO_BRANCH"
233 fi 234 fi
234 235
235 let CURRENT_STEP+=1 236 let CURRENT_STEP+=1
236 if [ $START_STEP -le $CURRENT_STEP ] ; then 237 if [ $START_STEP -le $CURRENT_STEP ] ; then
237 echo ">>> Step $CURRENT_STEP: Determine svn commit revision" 238 echo ">>> Step $CURRENT_STEP: Determine svn commit revision"
238 restore_if_unset "NEW_COMMIT_MSG" 239 restore_if_unset "NEW_COMMIT_MSG"
239 restore_if_unset "MERGE_TO_BRANCH" 240 restore_if_unset "MERGE_TO_BRANCH"
240 git svn fetch || die "'git svn fetch' failed." 241 git svn fetch || die "'git svn fetch' failed."
241 COMMIT_HASH=$(git log -1 --format=%H --grep="$NEW_COMMIT_MSG" \ 242 COMMIT_HASH=$(git log -1 --format=%H --grep="$NEW_COMMIT_MSG" \
242 svn/$MERGE_TO_BRANCH) 243 svn/$MERGE_TO_BRANCH)
(...skipping 28 matching lines...) Expand all
271 restore_if_unset "TO_URL" 272 restore_if_unset "TO_URL"
272 restore_if_unset "REVISION_LIST" 273 restore_if_unset "REVISION_LIST"
273 restore_version_if_unset "NEW" 274 restore_version_if_unset "NEW"
274 common_cleanup 275 common_cleanup
275 echo "*** SUMMARY ***" 276 echo "*** SUMMARY ***"
276 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" 277 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH"
277 echo "branch: $TO_URL" 278 echo "branch: $TO_URL"
278 echo "svn revision: $SVN_REVISION" 279 echo "svn revision: $SVN_REVISION"
279 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" 280 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST"
280 fi 281 fi
OLDNEW
« no previous file with comments | « PRESUBMIT.py ('k') | tools/push-to-trunk.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698