Reviewers: danno,
Description:
Fix "already merging" safety check in merge-to-branch.sh
[email protected]
Please review this at https://chromiumcodereview.appspot.com/9689062/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M tools/merge-to-branch.sh
Index: tools/merge-to-branch.sh
diff --git a/tools/merge-to-branch.sh b/tools/merge-to-branch.sh
index
484558cfad9024f2c5e4be6dc5beb0adc9dfc62d..d75cafd906861154124d31606b020129232e9680
100755
--- a/tools/merge-to-branch.sh
+++ b/tools/merge-to-branch.sh
@@ -88,7 +88,7 @@ shift $OPTION_COUNT
########## 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
