Revision: 11031
Author: [email protected]
Date: Tue Mar 13 08:57:31 2012
Log: Fix "already merging" safety check in merge-to-branch.sh
[email protected]
Review URL: https://chromiumcodereview.appspot.com/9689062
http://code.google.com/p/v8/source/detail?r=11031
Modified:
/branches/bleeding_edge/tools/merge-to-branch.sh
=======================================
--- /branches/bleeding_edge/tools/merge-to-branch.sh Fri Mar 9 02:16:00
2012
+++ /branches/bleeding_edge/tools/merge-to-branch.sh Tue Mar 13 08:57:31
2012
@@ -88,7 +88,7 @@
########## Regular workflow
# If there is a merge in progress, abort.
-[[ -e "$ALREADY_MERGING_SENTINEL_FILE" ]] && [[ -z "$START_STEP" ]] \
+[[ -e "$ALREADY_MERGING_SENTINEL_FILE" ]] && [[ $START_STEP -eq 0 ]] \
&& die "A merge is already in progress"
touch "$ALREADY_MERGING_SENTINEL_FILE"
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
