Issue 1595018: Change |scm.GIT.GenerateDiff| and |scm.GIT.GetDifferentFiles| to ignore unmerged upstream changes.

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 1595018: Change |scm.GIT.GenerateDiff| and |scm.GIT.GetDifferentFiles| to ignore unmerged upstream changes. (Closed)

Created:
10 years, 8 months ago by Bernhard Bauer

Modified:
9 years, 7 months ago

Reviewers:
Evan Martin, M-A Ruel

CC:
chromium-reviews

Visibility:
Public.

Created: 10 years, 8 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+2 lines, -2 lines)			Patch
	M	scm.py	View		2 chunks	+2 lines, -2 lines	0 comments	Download

Total messages: 3 (0 generated)

Bernhard Bauer

Could you review this? I changed git diff-tree to git diff, because diff-tree doesn't accept ...

10 years, 8 months ago (2010-04-09 10:22:52 UTC) #1

M-A Ruel

10 years, 8 months ago (2010-04-09 16:57:05 UTC) #3

I'm not intimate with all the git algos, "as long as it works".

Make sure ./presubmit_support.py *.py returns success.

lgtm