Bug 48244

Summary:

webkit-patch rollout produces incorrect patch when using svn move

Product:

WebKit

Reporter:

Andras Becsi <abecsi>

Component:

Tools / Tests

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

abarth, abecsi, cjerdonek, commit-queue, eric, ossy, webkit.review.bot

Priority:

Version:

528+ (Nightly build)

Hardware:

OS:

All

Attachments:

Description	Flags
Patch	none

Andras Becsi

Reported 2010-10-25 08:50:16 PDT

During the rolling out of r70450 sheriffbot produced a patch which landed in r70453. This patch broke the build by not renaming the MappedMemoryPool.h file back to it's original name MappedMemory.h. The problem might be cased by webkit-patch rollout incorrectly handling the svn move command.

Attachments
Patch (1.23 KB, patch) 2010-10-25 21:46 PDT, Adam Barth	no flags	Details Formatted Diff Diff
View All Add attachment proposed patch, testcase, etc.

Csaba Osztrogonác

Comment 1 2010-10-25 08:53:06 PDT

(In reply to comment #0) > During the rolling out of r70450 sheriffbot produced a patch which landed in r70453. > This patch broke the build by not renaming the MappedMemoryPool.h file back to it's original name MappedMemory.h. > The problem might be cased by webkit-patch rollout incorrectly handling the svn move command. MappedMemory.h was moved and modified before landing.

Eric Seidel (no email)

Comment 2 2010-10-25 11:04:12 PDT

Is this a recent regression? Adam recently changed how files were passed around in scm.py

Csaba Osztrogonác

Comment 3 2010-10-25 15:14:50 PDT

(In reply to comment #2) > Is this a recent regression? Adam recently changed how files were passed around in scm.py Yes, it is. :( Just check r70450 and r70453.

Adam Barth

Comment 4 2010-10-25 21:21:19 PDT

Maybe we need to clear out the cached list of changed_files at some point in the rollout process?

Adam Barth

Comment 5 2010-10-25 21:46:05 PDT

Created attachment 71840 [details] Patch

Eric Seidel (no email)

Comment 6 2010-10-25 21:51:08 PDT

Comment on attachment 71840 [details] Patch LGTM.

WebKit Commit Bot

Comment 7 2010-10-26 11:36:54 PDT

Comment on attachment 71840 [details] Patch Clearing flags on attachment: 71840 Committed r70547: <http://trac.webkit.org/changeset/70547>

WebKit Commit Bot

Comment 8 2010-10-26 11:37:00 PDT

All reviewed patches have been landed. Closing bug.

WebKit Review Bot

Comment 9 2010-10-26 12:05:47 PDT

http://trac.webkit.org/changeset/70547 might have broken Qt Linux Release The following tests are not passing: fast/blockflow/floats-in-block-layout.html fast/blockflow/self-collapsing-block.html fast/multicol/nested-columns.html

Note You need to log in before you can comment on or make changes to this bug.