Issue 6139060: Merge with default

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 6139060: Merge with default (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
13 years, 4 months ago by Roger Tawa

Modified:
13 years, 4 months ago

Reviewers:
M-A

Visibility:
Public.

More Reviews

Description

Merging default @ 9ea01dc1c46e: hg merge -r default Committed: http://code.google.com/p/rietveld/source/detail?r=2972a6fd9a4713862609a49d6bc953ca76fa2339&name=chromium

Patch Set 1 #

Total comments: 1

Created: 13 years, 4 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+164 lines, -39 lines)			Patch
M	Makefile	View	2 chunks	+7 lines, -3 lines	0 comments	Download
M	app.yaml	View	1 chunk	+0 lines, -5 lines	0 comments	Download
M	appengine_config.py	View	2 chunks	+10 lines, -10 lines	0 comments	Download
M	codereview/views.py	View	1 chunk	+4 lines, -3 lines	0 comments	Download
M	static/script.js	View	10 chunks	+115 lines, -1 line	0 comments	Download
M	templates/base.html	View	1 chunk	+3 lines, -0 lines	0 comments	Download
M	templates/diff.html	View	2 chunks	+2 lines, -2 lines	0 comments	Download
M	tools/uploadopts2wiki.py	View	3 chunks	+14 lines, -1 line	0 comments	Download
M	upload.py	View	5 chunks	+9 lines, -14 lines	1 comment	Download

Messages

Total messages: 3

Expand All Messages | Collapse All Messages

M-A

http://codereview.appspot.com/6139060/diff/1/upload.py File upload.py (right): http://codereview.appspot.com/6139060/diff/1/upload.py#newcode2338 upload.py:2338: payload["message"] = message We will probably have to convert ...

13 years, 4 months ago (2012-04-30 15:55:31 UTC) #2

M-A

13 years, 4 months ago (2012-04-30 16:04:54 UTC) #3

lgtm, just be prepared to update git-cl & gcl if they misbehave, I think they
will.

Expand All Messages | Collapse All Messages