Issue 6242: Merge trunk up to r331 into chromium branch.

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

Rietveld Code Review Tool

Help | Bug tracker | Discussion group | Source code | Sign in

(68)

Issues Repositories Search

Open Issues | Closed Issues | All Issues | Sign in with your Google Account to create issues and add comments

Issue 6242: Merge trunk up to r331 into chromium branch.

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

Created:
17 years, 3 months ago by Evan Martin

Modified:
16 years, 5 months ago

Reviewers:
JohnA

Visibility:
Public.

Merge trunk up to r331 into chromium branch. Conflicting files: codereview/views.py static/upload.py

Patch Set 1 #

Patch Set 2 : against 331 #

Patch Set 3 : fixed whitespace #

Patch Set 4 : fixed whitespace #

Created: 17 years, 3 months ago

Download [raw] [tar.bz2]

Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+636 lines, -184 lines)			Patch
M	TODO	View	1 chunk	+0 lines, -6 lines	0 comments	Download
M	codereview/engine.py	View	1 chunk	+1 line, -1 line	0 comments	Download
A	codereview/feeds.py	View	1 chunk	+140 lines, -0 lines	0 comments	Download
M	codereview/models.py	View	1 chunk	+14 lines, -2 lines	0 comments	Download
M	codereview/urls.py	View	2 chunks	+18 lines, -0 lines	0 comments	Download
M	codereview/views.py	View	1 2	9 chunks	+70 lines, -21 lines	0 comments	Download
M	static/script.js	View	1 chunk	+41 lines, -0 lines	0 comments	Download
M	static/upload.py	View	18 chunks	+182 lines, -53 lines	0 comments	Download
M	templates/base.html	View	2 chunks	+39 lines, -2 lines	0 comments	Download
A	templates/feeds/all_description.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	templates/feeds/all_title.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	templates/feeds/closed_description.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	templates/feeds/closed_title.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	templates/feeds/issue_description.html	View	1 chunk	+7 lines, -0 lines	0 comments	Download
A	templates/feeds/issue_title.html	View	1 chunk	+5 lines, -0 lines	0 comments	Download
A	templates/feeds/mine_description.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	templates/feeds/mine_title.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	templates/feeds/reviews_description.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	templates/feeds/reviews_title.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	templates/feeds/template_description.html	View	1 chunk	+5 lines, -0 lines	0 comments	Download
A	templates/feeds/template_title.html	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	templates/issue.html	View	4 chunks	+13 lines, -99 lines	0 comments	Download
A	templates/patchset.html	View	1 chunk	+92 lines, -0 lines	0 comments	Download

Total messages: 2

Evan Martin

From working on the webkit merge, I've learned it's good to merge frequently. Please take ...

17 years, 3 months ago (2008年09月26日 18:21:26 UTC) #1

From working on the webkit merge, I've learned it's good to merge frequently. 
Please take a special look at the two files I mentioned as conflicting -- I
think I did the right thing there, but I'm not 100% sure.