Summary: | Directory Upload: parent path can truncate first char of the correct path | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | John Gregg <johnnyg> | ||||||||||
Component: | New Bugs | Assignee: | John Gregg <johnnyg> | ||||||||||
Status: | RESOLVED FIXED | ||||||||||||
Severity: | Normal | CC: | webkit.review.bot | ||||||||||
Priority: | P2 | ||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||
Hardware: | Unspecified | ||||||||||||
OS: | Unspecified | ||||||||||||
Attachments: |
|
Description
John Gregg
2011-08-22 11:42:21 PDT
Created attachment 104712 [details]
Patch
Created attachment 104718 [details]
Patch
Comment on attachment 104718 [details] Patch Rejecting attachment 104718 [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: ource/WebCore/html/FileInputType.cpp Merge conflict during commit: Conflict at '/trunk/LayoutTests/ChangeLog' at /usr/lib/git-core/git-svn line 572 Failed to run "[u'git', u'svn', u'dcommit']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Updating OpenSource Current branch master is up to date. Updating chromium port dependencies using gclient... ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/9644231 Created attachment 108035 [details]
Patch
Comment on attachment 108035 [details]
Patch
same patch with ChangeLog merge
Comment on attachment 108035 [details] Patch Rejecting attachment 108035 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 Last 500 characters of output: 44d8954c7a83fe158458e9ca2a446470bb3628c9 r95560 = f9531f1c18e5f308c712cd42d58fab7284ec7a26 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Updating chromium port dependencies using gclient... ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/9772357 Created attachment 108048 [details]
Patch for landing
Comment on attachment 108048 [details] Patch for landing Clearing flags on attachment: 108048 Committed r95582: <http://trac.webkit.org/changeset/95582> All reviewed patches have been landed. Closing bug. |