Bug 48244 - webkit-patch rollout produces incorrect patch when using svn move
Summary: webkit-patch rollout produces incorrect patch when using svn move
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC All
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-10-25 08:50 PDT by Andras Becsi
Modified: 2010-10-26 12:05 PDT (History)
7 users (show)

See Also:


Attachments
Patch (1.23 KB, patch)
2010-10-25 21:46 PDT, Adam Barth
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andras Becsi 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.
Comment 1 Csaba Osztrogonác 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.
Comment 2 Eric Seidel (no email) 2010-10-25 11:04:12 PDT
Is this a recent regression?  Adam recently changed how files were passed around in scm.py
Comment 3 Csaba Osztrogonác 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.
Comment 4 Adam Barth 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?
Comment 5 Adam Barth 2010-10-25 21:46:05 PDT
Created attachment 71840 [details]
Patch
Comment 6 Eric Seidel (no email) 2010-10-25 21:51:08 PDT
Comment on attachment 71840 [details]
Patch

LGTM.
Comment 7 WebKit Commit Bot 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>
Comment 8 WebKit Commit Bot 2010-10-26 11:37:00 PDT
All reviewed patches have been landed.  Closing bug.
Comment 9 WebKit Review Bot 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