Our plan is to set the WebKit2 build in default ews and/or buildbot builds. The problem is that our build can break because of a single new included file. As I see this is not true for mac and win (they copy almost all WebCore header to the build dir). I want to use a more sophisticated solution: generate the list of the headers with a script and use the stdout of the script in the DerivedSources.pro.
Created attachment 64957 [details] Patch
Eric, could you clue me up about what is wrong with this patch? I have created it with svn-create-patch. Normally I am using git but I would have liked to create the new file with svn copy this time.
This may be an svn-apply regression. CCing Dan.
Comment on attachment 64957 [details] Patch Nice one :) LGTM re=me
Comment on attachment 64957 [details] Patch Rejecting patch 64957 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Ariya Hidayat', u'--force']" exit_code: 255 Failed to find the property value for the SVN property "svn:mergeinfo": " Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 ". at /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/VCSUtils.pm line 1036, <ARGV> line 322. Full output: http://queues.webkit.org/results/3801156
I think this is an svn-apply regression. Dan Bates is already CC'd.
(In reply to comment #5) > (From update of attachment 64957 [details]) > Rejecting patch 64957 from commit-queue. > > Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Ariya Hidayat', u'--force']" exit_code: 255 > Failed to find the property value for the SVN property "svn:mergeinfo": " Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 > ". at /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/VCSUtils.pm line 1036, <ARGV> line 322. > > Full output: http://queues.webkit.org/results/3801156 This patch contains an svn:mergeinfo property change: [[ Property changes on: WebKitTools/Scripts/enumerate-included-framework-headers ___________________________________________________________________ Added: svn:mergeinfo Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 ]] I'm not familiar with this property. So far, from reading <http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.basicmerging.mergeinfo> this property is used by SVN to "track changesets—that is, which changes have been merged to which branches". svn-apply/svn-unapply do not support the svn:mergeinfo property. I'm currently trying to better understand svn merge/the svn:mergeinfo property.
Here is my use case: - creating the new file by "svn copy find-included-framework-headers enumerate-included-framework-headers" - editing the new file - creating the patch by "svn-create-patch", however svn diff has similar output I am not familiar with merge logic of svn but it seems like this copy and edit use case is handled by the merginfo property. I am going to land this with a git diff now if you do not mind.
Committed r65808: <http://trac.webkit.org/changeset/65808>
Comment on attachment 64957 [details] Patch Clearing flags.
(In reply to comment #7) > (In reply to comment #5) > > (From update of attachment 64957 [details] [details]) > > Rejecting patch 64957 from commit-queue. > > > > Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Ariya Hidayat', u'--force']" exit_code: 255 > > Failed to find the property value for the SVN property "svn:mergeinfo": " Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 > > ". at /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/VCSUtils.pm line 1036, <ARGV> line 322. > > > > Full output: http://queues.webkit.org/results/3801156 > > This patch contains an svn:mergeinfo property change: > [[ > Property changes on: WebKitTools/Scripts/enumerate-included-framework-headers > ___________________________________________________________________ > Added: svn:mergeinfo > Merged /trunk/WebKitTools/Scripts/find-included-framework-headers:r53455 > ]] > > I'm not familiar with this property. So far, from reading <http://svnbook.red- > [...] Filed bug #45236 to add support to svn-apply/unapply for recognizing the svn:mergeinfo property and hence process patches that contain it.