Issue 10939033: Wait for resolving conflicts in merge-to-branch script.

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

Issue 10939033: Wait for resolving conflicts in merge-to-branch script. (Closed)

Created:
8 years, 3 months ago by ulan

Modified:
8 years, 3 months ago

Reviewers:
Jakob Kummerow

CC:
v8-dev

Base URL:
https://v8.googlecode.com/svn/branches/bleeding_edge

Visibility:
Public.

More Reviews

Description

Wait for resolving conflicts in merge-to-branch script. R=jkummerow@chromium.org Committed: https://code.google.com/p/v8/source/detail?r=12560

Patch Set 1 : #

Total comments: 1

Patch Set 2 : Address comment #

Created: 8 years, 3 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+14 lines, -1 line)			Patch
	M	tools/common-includes.sh	View	1	1 chunk	+14 lines, -1 line	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

Jakob Kummerow

8 years, 3 months ago (2012-09-19 16:29:24 UTC) #2

LGTM. Nice idea!

https://chromiumcodereview.appspot.com/10939033/diff/2001/tools/common-includ...
File tools/common-includes.sh (right):

https://chromiumcodereview.appspot.com/10939033/diff/2001/tools/common-includ...
tools/common-includes.sh:184: echo "Applying the patch failed. Either type
\"ABORT<Return>\" or \
nit: for readability, please insert a comma before the "or".

Expand Messages | Collapse Messages