Oops, I used wrong address again... The error was 409 Conflict. The error message of bugzilla-tools land-diff was
Parsing ChangeLog: LayoutTests/ChangeLog svn: Commit failed (details follow): svn: MERGE request failed on '/repository/webkit/trunk/LayoutTests' svn: MERGE of '/repository/webkit/trunk/LayoutTests': 409 Conflict (http://svn.webkit.org) Traceback (most recent call last): File "./WebKitTools/Scripts/bugzilla-tool", line 928, in <module> main() File "./WebKitTools/Scripts/bugzilla-tool", line 925, in main return tool.main() File "./WebKitTools/Scripts/bugzilla-tool", line 920, in main return command_object.execute(command_options, command_args, self) File "./WebKitTools/Scripts/bugzilla-tool", line 308, in execute comment_text = WebKitLandingScripts.build_and_commit(tool.scm(), options) File "./WebKitTools/Scripts/bugzilla-tool", line 264, in build_and_commit commit_log = scm.commit_with_message(commit_message.message()) File "/Users/hamaji/svn/3WebKit/WebKitTools/Scripts/modules/scm.py", line 340, in commit_with_message return self.run_command(['svn', 'commit', '-m', message]) File "/Users/hamaji/svn/3WebKit/WebKitTools/Scripts/modules/scm.py", line 97, in run_command raise ScriptError('Failed to run "%s" exit_code: %d cwd: %s' % (args, exit_code, cwd)) modules.scm.ScriptError: Failed to run "['svn', 'commit', '-m', '2009-09-21 Shinichiro Hamaji <[email protected]>\n\n Rubber-stamped by Eric Seidel.\n\n js tests should move into jstests subdirectory instead of resources/\n ... snipped ... Today, I tried to commit again but it failed. Any hints will be very appreciated. Thanks, On Sat, Sep 19, 2009 at 11:00 PM, David Kilzer <[email protected]> wrote: > What error(s) did you get when you tried to commit them? > Dave > > From: Shinichiro Hamaji <[email protected]> > To: Eric Seidel <[email protected]> > Cc: [email protected] > Sent: Saturday, September 19, 2009 3:43:25 AM > Subject: Re: [webkit-dev] js-only-tests migration from "resources" to > "script-tests" > > +webkit-dev (I sent my previous reply from different address and it wasn't > delivered to this list) > I tried both svn and git to commit my change several times, but I couldn't > commit. I also tried to checkout whole repository again. > I tried to split my patch into small chunks and this succeeded for most of > directories. However, it seemed I couldn't commit patch for > LaytoutTests/fast/js and LayoutTests/fast/js/kde directories. Because I > could commit patches for other directories, I'm guessing that the server may > be somehow misconfigured for these directories. Could someone who can access > the SVN server check the error message? > The patch I'd like to commit is the 4th patch in the following bug: > https://bugs.webkit.org/show_bug.cgi?id=25880 > Thanks! > > On Sat, Sep 19, 2009 at 12:55 PM, Shinichiro Hamaji <[email protected]> > wrote: >> >> Hmm... I tried to commit the huge patch several times, but the >> attempts failed by 500 Internal Server Error or 409 Conflict. 500 >> seems to happen occasionally. 409 happens even where there were no >> other commits while I'm running svn up, build&test, and svn commit. I >> guess apache produced more messages than I've got. I'm happy if >> someone in apple provide the information. >> >> Anyway, I'll try again later. By googling "svn 409 conflict", I've >> found this error can happen due to difference of versions of svn >> between client and server. I'll try git instead of svn to commit this >> change... >> >> Error messages I've seen were the following: >> >> svn: Commit failed (details follow): >> svn: COPY of fast/js/script-tests/do-while-semicolon.js: 500 Internal >> Server Error (http://svn.webkit.org) >> svn: Your commit message was left in a temporary file: >> svn: '/Users/hamaji/svn/WebKit/svn-commit.2.tmp' >> >> or >> >> Transmitting file data >> >> .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................svn: >> Commit failed (details follow): >> svn: MERGE request failed on '/repository/webkit/trunk/LayoutTests' >> svn: MERGE of '/repository/webkit/trunk/LayoutTests': 409 Conflict >> (http://svn.webkit.org) >> svn: Your commit message was left in a temporary file: >> svn: '/Users/hamaji/svn/WebKit/svn-commit.3.tmp' >> >> >> Any kind of help will be appreciated! >> >> On Fri, Sep 18, 2009 at 6:11 AM, Eric Seidel <[email protected]> wrote: >> > Looks fine. Thank you for giving warning so that people are aware of >> > this large change. >> > >> > -eric >> > >> > On Wed, Sep 16, 2009 at 6:17 PM, Shinichiro Hamaji <[email protected]> >> > wrote: >> >> Hi WebKit folks, >> >> >> >> With great helps from Eric and Darin, I'm working on moving js only >> >> layout tests from "resources" to "script-tests" directories. If there >> >> are no objections, I'll submit this patch after 24 hours. >> >> >> >> https://bugs.webkit.org/show_bug.cgi?id=25880 >> >> >> >> >> >> Motivation: >> >> >> >> We have a lot of layout tests which just includes a javascript which >> >> tests something with our js test framework (js-test-pre.js, >> >> js-test-post.js, ...). For such tests, we have a tool to generate >> >> HTMLs from resources/TEMPLATE.html. This tool is >> >> WebKitTools/Scripts/make-script-test-wrappers. It generates HTMLs from >> >> resources/TEMPLATE.html for each resources/*.js. You can write the >> >> list of exceptions in make-script-wrappers script to tell the tool not >> >> to re-generate your HTML. Otherwise, your modified HTMLs will be >> >> overwritten by the next run of make-script-wrappers. So, if you have >> >> layout test HTMLs which are modified from TEMPLATE.html, you should >> >> always add the name of your script into the exception list in >> >> make-script-wrappers. >> >> >> >> Unfortunately, sometimes people forget the existence of this tool and >> >> people like me a month ago may not notice this tool at all. Though we >> >> should see no change by running make-script-wrappers using unchanged >> >> ToT, it actually changes some HTMLs. Also, even for people who know >> >> this mechanism well, it's annoying to add the exception list. Eric >> >> suggested to move such js-only-tests from "resources" directory to >> >> another directory so make-script-wrappers knows which files should be >> >> generated without the exception list. We don't need to modify >> >> make-script-wrappers script when you add layout tests which have a >> >> custom HTML after this change. >> >> >> >> >> >> What will change: >> >> >> >> All js only tests will go to "script-tests" sub-directories by the >> >> next commit which will be dome after 24 hours. The >> >> make-script-wrappers and run-webkit-tests script have been already >> >> changed and they care about both "resources" and "script-tests" for >> >> now. They were tested with LayoutTests/animations directory and it >> >> seems to be working. Also, the next patch is passing run-webkit-tests. >> >> >> >> >From now, please put your js-only-tests into "script-tests" >> >> sub-directory instead of "resources" directory. After the migration >> >> patch is submitted, I'll remove support for "resources" directory from >> >> make-script-wrappers. >> >> >> >> The current plan of the next steps is >> >> >> >> 1. Submit the migration ("resources" => "script-tests") patch. >> >> 2. Fix all layout tests which are modified from ToT by >> >> make-script-wrappers script. Some of them will go to script-tests and >> >> be re-generated. For others, I'll add them into make-script-wrappers' >> >> exception list. >> >> 3. Remove support of "resources" directory from make-script-wrappers >> >> so that we don't have the exception list anymore! >> >> >> >> >> >> If there are something unclear, please feel to free to ask. I hope you >> >> like this change and start to put your js-only-tests in "script-tests" >> >> sub-directory. >> >> >> >> >> >> P.S. Eric and Darin, if there are something I should have noticed, >> >> please add some comments on this email. Otherwise, I was lucky :) >> >> >> >> Thanks! >> >> _______________________________________________ >> >> webkit-dev mailing list >> >> [email protected] >> >> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev >> >> >> > > > _______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
