Bug 96545 - [Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --no-webkit2
Summary: [Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --n...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Simon Hausmann
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-09-12 12:50 PDT by Simon Hausmann
Modified: 2012-09-13 01:50 PDT (History)
2 users (show)

See Also:

Attachments
Patch (1.73 KB, patch)
2012-09-12 12:52 PDT, Simon Hausmann 		vestbo: review+
webkit.review.bot: commit-queue-
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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>