tools/merge-to-branch.sh - Issue 9689062: Fix "already merging" safety check in merge-to-branch.sh

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/merge-to-branch.sh

Issue 9689062: Fix "already merging" safety check in merge-to-branch.sh (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 8 years, 9 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:

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"

« no previous file with comments | « no previous file | no next file » | no next file with comments »