Issue 20289: On Windows, find all modified files after a WebKit merge and force them...

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 20289: On Windows, find all modified files after a WebKit merge and force them... (Closed)

Created:
11 years, 10 months ago by Pam (message me for reviews)

Modified:
9 years, 5 months ago

Reviewers:
ojan

CC:
chromium-reviews_googlegroups.com

Base URL:
svn://chrome-svn/chrome/trunk/src/

Visibility:
Public.

Description

On Windows, find all modified files after a WebKit merge and force them to LF. 'svn merge' saves them with CRLF otherwise, which interferes with later merges. Remove the now-obsolete code that did the same thing after a 3-way merge, which only took effect when a file had conflicts. BUG=7536 TEST=run a merge, see no CRLF in text files Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=9650

Patch Set 1 #

Total comments: 1

Created: 11 years, 10 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+24 lines, -3 lines)			Patch
	M	webkit/tools/merge/diff3-wrapper.py	View		1 chunk	+0 lines, -3 lines	0 comments	Download
	M	webkit/tools/merge/merge.py	View		2 chunks	+24 lines, -0 lines	1 comment	Download

Messages

Total messages: 3 (0 generated)

Expand Messages | Collapse Messages

ojan

LGTM after resolving below issue. http://codereview.chromium.org/20289/diff/1/2 File webkit/tools/merge/merge.py (right): http://codereview.chromium.org/20289/diff/1/2#newcode91 Line 91: subprocess.call('dos2unix.exe %s' % ...

11 years, 10 months ago (2009-02-12 02:21:00 UTC) #2

Pam (message me for reviews)

11 years, 10 months ago (2009-02-12 13:36:52 UTC) #3

On 2009/02/12 02:21:00, ojan wrote:
> LGTM after resolving below issue.
> 
> http://codereview.chromium.org/20289/diff/1/2
> File webkit/tools/merge/merge.py (right):
> 
> http://codereview.chromium.org/20289/diff/1/2#newcode91
> Line 91: subprocess.call('dos2unix.exe %s' % file_path,
> shouldn't this be using command?


Fixed and committed. Thanks!

- Pam

Expand Messages | Collapse Messages