Bug 96545

Summary: [Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --no-webkit2
Product: WebKit Reporter: Simon Hausmann <hausmann>
Component: New BugsAssignee: Simon Hausmann <hausmann>
Status: RESOLVED FIXED    
Severity: Normal CC: vestbo, webkit.review.bot
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch vestbo: review+, webkit.review.bot: commit-queue-

Description Simon Hausmann 2012-09-12 12:50:50 PDT
[Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --no-webkit2
Comment 1 Simon Hausmann 2012-09-12 12:52:05 PDT
Created attachment 163673 [details]
Patch
Comment 2 WebKit Review Bot 2012-09-13 01:44:28 PDT
Comment on attachment 163673 [details]
Patch

Rejecting attachment 163673 [details] from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2

Last 500 characters of output:
NFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 Web Inspector: CSS domain sends events while it is not enabled

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 164.

Full output: http://queues.webkit.org/results/13850045
Comment 3 Simon Hausmann 2012-09-13 01:50:30 PDT
Committed r128429: <http://trac.webkit.org/changeset/128429>