86973 2012-05-20 15:13:51 -0700 svn-apply fails to apply a patch that moves files from directory A to A/B 2012-05-20 16:29:19 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 86138 1 dbates dbates ddkilzer eric jsbell webkit.review.bot oldest_to_newest 628634 0 dbates 2012-05-20 15:13:51 -0700 svn-apply fails to apply attachment 142343 (bug #86138) with a Git checkout of WebKit: [[ Last 500 characters of output: n/storage/websql/transaction-error-callback-expected.txt patching file LayoutTests/platform/chromium/storage/quota-tracking-expected.txt rm 'LayoutTests/platform/chromium/storage/quota-tracking-expected.txt' patching file LayoutTests/platform/chromium/storage/sql-error-codes-expected.txt rm 'LayoutTests/platform/chromium/storage/sql-error-codes-expected.txt' Failed to create required directory 'LayoutTests/platform/chromium/storage/websql' for path 'LayoutTests/platform/chromium/storage/websql' ]] Notice that Git removes a directory when the last file in it is removed and moving a file F in directory A to directory B in a version control system is equivalent to deleting F in A and adding F to B. With respect to moving files from A to A/B (i.e. B is a sub-directory in A), svn-apply assumes that A must exist. As of 05/20/2012 (*), the directory LayoutTests/platform/chromium/storage contains exactly two files: quota-tracking-expected.txt and sql-error-codes-expected.txt. When we apply attachment 142343, we first remove both of these files from directory LayoutTests/platform/chromium/storage. Then Git removes the directory LayoutTests/platform/chromium/storage (since it's empty). Svn-apply then tries to create the directory LayoutTests/platform/chromium/storage/websql and fails (since it assumes that the directory LayoutTests/platform/chromium/storage exists). (*) <http://trac.webkit.org/browser/trunk/LayoutTests/platform/chromium/storage?rev=62094> 628638 1 142920 dbates 2012-05-20 15:36:06 -0700 Created attachment 142920 Patch 628644 2 142920 eric 2012-05-20 15:49:33 -0700 Comment on attachment 142920 Patch So simple! :) 628653 3 142920 webkit.review.bot 2012-05-20 16:29:14 -0700 Comment on attachment 142920 Patch Clearing flags on attachment: 142920 Committed r117714: <http://trac.webkit.org/changeset/117714> 628654 4 webkit.review.bot 2012-05-20 16:29:19 -0700 All reviewed patches have been landed. Closing bug. 142920 2012-05-20 15:36:06 -0700 2012-05-20 16:29:14 -0700 Patch Bug86973.patch text/plain 2379 dbates SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExNzcxMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDEyLTA1LTIwICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4K KworICAgICAgICBzdm4tYXBwbHkgZmFpbHMgdG8gYXBwbHkgYSBwYXRjaCB0aGF0IG1vdmVzIGZp bGVzIGZyb20gZGlyZWN0b3J5IEEgdG8gQS9CCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04Njk3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZpeGVzIGFuIGlzc3VlIHdoZXJlIHN2bi1hcHBseSBmYWlscyB0 byBhcHBseSBhIHBhdGNoIHRoYXQgbW92ZXMgZmlsZXMgaW4gYQorICAgICAgICBkaXJlY3Rvcnkg QSB0byBzb21lIHN1Yi1kaXJlY3RvcnkgQiBpbiBBIHdpdGggYSBHaXQgY2hlY2tvdXQgb2YgV2Vi S2l0LgorCisgICAgICAgIEN1cnJlbnRseSwgc3ZuLWFwcGx5IG9ubHkgY3JlYXRlcyBuZXcgZGly ZWN0b3JpZXMgYWxvbmcgYSBmaWxlIHN5c3RlbSBwYXRoIHRoYXQKKyAgICAgICAgaXQgaGFzbid0 IGFscmVhZHkgcHJvY2Vzc2VkLiBUaGF0IGlzLCBpZiBzdm4tYXBwbHkgY3JlYXRlcy90cmF2ZXJz ZXMgYWxsIHRoZQorICAgICAgICBpbnRlcm1lZGlhdGUgZGlyZWN0b3JpZXMgYWxvbmcgdGhlIHBh dGggQS9CIHRoZW4gaXQgd2lsbCBhc3N1bWUgdGhlIGRpcmVjdG9yeSBBL0IKKyAgICAgICAgZXhp c3RzIGZvciBhbGwgc3Vic2VxdWVudCByZXF1ZXN0cyB0byBjcmVhdGUgc3ViLWRpcmVjdG9yaWVz IGluIEEvQiAoZS5nLiBBL0IvQykuCisgICAgICAgIFdoZW4gbW92aW5nIGEgZmlsZSBGIGluIGRp cmVjdG9yeSBBIHRvIGRpcmVjdG9yeSBBL0IgdXNpbmcgYSBHaXQgY2hlY2tvdXQsIEdpdAorICAg ICAgICBtYXkgcmVtb3ZlIGRpcmVjdG9yeSBBIGlmIEYgaXMgdGhlIGxhc3QgZmlsZSBpbiBBLiBU aGVyZWZvcmUsIHN2bi1hcHBseSB3aWxsIGZhaWwKKyAgICAgICAgdG8gY3JlYXRlIHN1Yi1kaXJl Y3RvcnkgQiBpbiBBIChzaW5jZSBBIG5vIGxvbmdlciBleGlzdHMpLgorCisgICAgICAgICogU2Ny aXB0cy9zdm4tYXBwbHk6CisgICAgICAgIChhZGREaXJlY3Rvcmllc0lmTmVlZGVkKToKKwogMjAx Mi0wNS0yMCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFtDaHJvbWl1bV0gUHJpbnQgbGF5b3V0IHRlc3QgcmVzdWx0IG9uIGJ1aWxkYm90CkluZGV4 OiBUb29scy9TY3JpcHRzL3N2bi1hcHBseQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3N2 bi1hcHBseQkocmV2aXNpb24gMTE3NzExKQorKysgVG9vbHMvU2NyaXB0cy9zdm4tYXBwbHkJKHdv cmtpbmcgY29weSkKQEAgLTE2MSwxMiArMTYxLDE2IEBAIGV4aXQgJGdsb2JhbEV4aXRTdGF0dXM7 CiAKIHN1YiBhZGREaXJlY3Rvcmllc0lmTmVlZGVkKCQpCiB7CisgICAgIyBHaXQgcmVtb3ZlcyBh IGRpcmVjdG9yeSBvbmNlIHRoZSBsYXN0IGZpbGUgaW4gaXQgaXMgcmVtb3ZlZC4gV2UgbmVlZAor ICAgICMgZXhwbGljaXRseSBjaGVjayBmb3IgdGhlIGV4aXN0ZW5jZSBvZiBlYWNoIGRpcmVjdG9y eSBhbG9uZyB0aGUgcGF0aAorICAgICMgKGFuZCBjcmVhdGUgaXQgaWYgaXQgZG9lc24ndCkgc28g YXMgdG8gc3VwcG9ydCBwYXRjaGVzIHRoYXQgbW92ZSBhbGwgZmlsZXMgaW4KKyAgICAjIGRpcmVj dG9yeSBBIHRvIEEvQi4gVGhhdCBpcywgd2UgY2Fubm90IGRlcGVuZCBvbiAlY2hlY2tlZERpcmVj dG9yaWVzLgogICAgIG15ICgkcGF0aCkgPSBAXzsKICAgICBteSBAZGlycyA9IEZpbGU6OlNwZWMt PnNwbGl0ZGlyKCRwYXRoKTsKICAgICBteSAkZGlyID0gIi4iOwogICAgIHdoaWxlIChzY2FsYXIg QGRpcnMpIHsKICAgICAgICAgJGRpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkZGlyLCBzaGlmdCBA ZGlycyk7Ci0gICAgICAgIG5leHQgaWYgZXhpc3RzICRjaGVja2VkRGlyZWN0b3JpZXN7JGRpcn07 CisgICAgICAgIG5leHQgaWYgIWlzR2l0KCkgJiYgZXhpc3RzICRjaGVja2VkRGlyZWN0b3JpZXN7 JGRpcn07CiAgICAgICAgIGlmICghIC1lICRkaXIpIHsKICAgICAgICAgICAgIG1rZGlyICRkaXIg b3IgZGllICJGYWlsZWQgdG8gY3JlYXRlIHJlcXVpcmVkIGRpcmVjdG9yeSAnJGRpcicgZm9yIHBh dGggJyRwYXRoJ1xuIjsKICAgICAgICAgICAgIHNjbUFkZCgkZGlyKTsK