167264 2017-01-20 15:56:47 -0800 svn-create-patch should emit properties when files are moved or copied 2017-01-23 12:16:37 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=167169 P2 Normal --- 1 jbedard jbedard commit-queue dbates ddkilzer lforschler oldest_to_newest 1268630 0 jbedard 2017-01-20 15:56:47 -0800 svn-create-patch does not emit properties when files are moved or copied through svn move or svn copy. 1268636 1 299401 jbedard 2017-01-20 16:07:35 -0800 Created attachment 299401 Patch 1268666 2 299408 jbedard 2017-01-20 17:20:46 -0800 Created attachment 299408 Patch 1268672 3 jbedard 2017-01-20 17:23:43 -0800 (In reply to comment #2) > Created attachment 299408 [details] > Patch Minor change on the original patch, same result. Note that without https://bugs.webkit.org/show_bug.cgi?id=167169, this code will fail to emit the correct patch in the following case: svn mv file1 file2 svn propset <property> file2 In this case (and similar cases) the patch will result in file2 having the same properties as file1 1268684 4 299408 dbates 2017-01-20 17:58:32 -0800 Comment on attachment 299408 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299408&action=review > Tools/Scripts/svn-create-patch:331 > - print `svn cat ${escapedSourceFile} | diff -u $devNull - | tail -n +3`; > + print `svn diff -r 0:${sourceRevision} ${escapedSourceFile} | tail -n +5`; I suspect that some (hopefully ancient) version of SVN did not support diffing against revision 0 and this led us to come up with the svn cat | diff workaround when we added this function in the patch for bug #12023. Is there a version of SVN that does not support diffing from revision 0? If so, do we need to support such an SVN version (say, for Windows, GTK or EFL ports)? From my own testing, SVN version 1.7.4 (r1295709) and 1.9.4 (r1740329) support diffing against revision 0. 1269075 5 299408 jbedard 2017-01-23 09:38:57 -0800 Comment on attachment 299408 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299408&action=review >> Tools/Scripts/svn-create-patch:331 >> + print `svn diff -r 0:${sourceRevision} ${escapedSourceFile} | tail -n +5`; > > I suspect that some (hopefully ancient) version of SVN did not support diffing against revision 0 and this led us to come up with the svn cat | diff workaround when we added this function in the patch for bug #12023. Is there a version of SVN that does not support diffing from revision 0? If so, do we need to support such an SVN version (say, for Windows, GTK or EFL ports)? > > From my own testing, SVN version 1.7.4 (r1295709) and 1.9.4 (r1740329) support diffing against revision 0. I couldn't find any documentation that would indicate this ever didn't work. If this did fail, it would likely look something like this: svn: E#: Syntax error in revision argument '0:r#' 1269104 6 299408 dbates 2017-01-23 10:52:52 -0800 Comment on attachment 299408 Patch The Windows, GTK and EFL bots didn't complain. Let's try this! 1269126 7 299408 jbedard 2017-01-23 12:14:06 -0800 Comment on attachment 299408 Patch Just as an additional note, it seems that we don't use this technique anywhere else, and talking with Dave Kilzer, this was not a technique considered originally. 1269128 8 299408 commit-queue 2017-01-23 12:16:32 -0800 Comment on attachment 299408 Patch Clearing flags on attachment: 299408 Committed r211048: <http://trac.webkit.org/changeset/211048> 1269129 9 commit-queue 2017-01-23 12:16:37 -0800 All reviewed patches have been landed. Closing bug. 299401 2017-01-20 16:07:35 -0800 2017-01-20 17:20:44 -0800 Patch bug-167264-20170120160542.patch text/plain 1330 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDk5MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE3LTAxLTIwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBzdm4tY3JlYXRlLXBhdGNoIHNob3VsZCBlbWl0IHByb3BlcnRpZXMgd2hl biBmaWxlcyBhcmUgbW92ZWQgb3IgY29waWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjcyNjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaDoKKyAgICAgICAg KG1hbnVmYWN0dXJlUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KTogRGlmZiB0aGUgc291cmNl IGZpbGUgYWdhaW5zdCBub3RoaW5nIHRvIGdldCBwcm9wZXJ0aWVzLgorCiAyMDE3LTAxLTIwICBB bGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVp bGQgRml4IGZvciBXaW5kb3dzIER1bXBSZW5kZXJUcmVlIGFmdGVyIHIyMTA5NzYKSW5kZXg6IFRv b2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3N2bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIxMDkzMCkKKysrIFRvb2xzL1NjcmlwdHMvc3Zu LWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtMzI4LDcgKzMyOCw4IEBAIHN1YiBtYW51 ZmFjdHVyZVBhdGNoRm9yQWRkaXRpb25XaXRoSGlzdG8KICAgICAgICAgcHJpbnQgInN2bjptaW1l LXR5cGUgPSAke21pbWVUeXBlfVxuXG4iOwogICAgIH0gZWxzZSB7CiAgICAgICAgIG15ICRlc2Nh cGVkU291cmNlRmlsZSA9IGVzY2FwZVN1YnZlcnNpb25QYXRoKCRzb3VyY2VGaWxlKTsKLSAgICAg ICAgcHJpbnQgYHN2biBjYXQgJHtlc2NhcGVkU291cmNlRmlsZX0gfCBkaWZmIC11ICRkZXZOdWxs IC0gfCB0YWlsIC1uICszYDsKKyAgICAgICAgbXkgQG91dHB1dCA9IHNwbGl0IC9cbi8sIGBzdm4g ZGlmZiAtciAwOiR7c291cmNlUmV2aXNpb259ICR7ZXNjYXBlZFNvdXJjZUZpbGV9YDsKKyAgICAg ICAgcHJpbnQgam9pbigiXG4iLCBzcGxpY2UoQG91dHB1dCwgNCwgc2NhbGFyKEBvdXRwdXQpKSks ICJcbiI7CiAgICAgfQogfQogCg== 299408 2017-01-20 17:20:46 -0800 2017-01-23 12:16:32 -0800 Patch bug-167264-20170120171853.patch text/plain 1254 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDk5MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE3LTAxLTIwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBzdm4tY3JlYXRlLXBhdGNoIHNob3VsZCBlbWl0IHByb3BlcnRpZXMgd2hl biBmaWxlcyBhcmUgbW92ZWQgb3IgY29waWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjcyNjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaDoKKyAgICAgICAg KG1hbnVmYWN0dXJlUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KTogRGlmZiB0aGUgc291cmNl IGZpbGUgYWdhaW5zdCBub3RoaW5nIHRvIGdldCBwcm9wZXJ0aWVzLgorCiAyMDE3LTAxLTIwICBB bGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVp bGQgRml4IGZvciBXaW5kb3dzIER1bXBSZW5kZXJUcmVlIGFmdGVyIHIyMTA5NzYKSW5kZXg6IFRv b2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3N2bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIxMDkzMCkKKysrIFRvb2xzL1NjcmlwdHMvc3Zu LWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtMzI4LDcgKzMyOCw3IEBAIHN1YiBtYW51 ZmFjdHVyZVBhdGNoRm9yQWRkaXRpb25XaXRoSGlzdG8KICAgICAgICAgcHJpbnQgInN2bjptaW1l LXR5cGUgPSAke21pbWVUeXBlfVxuXG4iOwogICAgIH0gZWxzZSB7CiAgICAgICAgIG15ICRlc2Nh cGVkU291cmNlRmlsZSA9IGVzY2FwZVN1YnZlcnNpb25QYXRoKCRzb3VyY2VGaWxlKTsKLSAgICAg ICAgcHJpbnQgYHN2biBjYXQgJHtlc2NhcGVkU291cmNlRmlsZX0gfCBkaWZmIC11ICRkZXZOdWxs IC0gfCB0YWlsIC1uICszYDsKKyAgICAgICAgcHJpbnQgYHN2biBkaWZmIC1yIDA6JHtzb3VyY2VS ZXZpc2lvbn0gJHtlc2NhcGVkU291cmNlRmlsZX0gfCB0YWlsIC1uICs1YDsKICAgICB9CiB9CiAK