215863 2020-08-26 13:32:08 -0700 [webkitpy] repository svn version is incorrect when working on a branch 2020-08-27 19:01:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 clopez clopez bburg bugs-noreply cgarcia dewei_zhu ews-watchlist glenn jbedard rniwa ross.kirsling webkit-bug-importer oldest_to_newest 1683103 0 clopez 2020-08-26 13:32:08 -0700 It seems than when you are working on a SVN branch, the SVN revision pointed by HEAD will *not* be the last change done on your branch, but the last change done on trunk (which is irrelevant for your checkout) See this example: 1. Check out webkitgtk-2.28.0 svn branch $ svn co http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.28.0 build # .... lot of files Checked out revision 266187. 2. Check what svn info says: $ cd build $ svn info Path: . Working Copy Root Path: /tmp/build URL: http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.28.0 Relative URL: ^/releases/WebKitGTK/webkit-2.28.0 Repository Root: http://svn.webkit.org/repository/webkit Repository UUID: 268f45cc-cd09-0410-ab3c-d52691b4dbfc Revision: 266187 Node Kind: directory Schedule: normal Last Changed Author: carlosgc@webkit.org Last Changed Rev: 258193 Last Changed Date: 2020-03-10 12:10:24 +0100 (Tue, 10 Mar 2020) So, the last change done on that branch was in reality r258193 (2020-03-10), but svn is saying that my working copy is r266187 (basically trunk of today) This causes the tool glib-revision to print the wrong revision, which then is passed to the build and the version stamped for the build is incorrect. $ Tools/glib/svn-revision r266187 I think we should pick the "Last Changed Rev" changeset instead of the "Revision" changeset from svn info. 1683105 1 407331 clopez 2020-08-26 13:35:36 -0700 Created attachment 407331 Patch 1683106 2 407331 jbedard 2020-08-26 13:38:26 -0700 Comment on attachment 407331 Patch Unfortunate we have no tests for this..... 1683107 3 jbedard 2020-08-26 13:39:05 -0700 (In reply to Jonathan Bedard from comment #2) > Comment on attachment 407331 [details] > Patch > > Unfortunate we have no tests for this..... (To be clear, this is not a request to add tests, simply a comment on how we've organized this part of webkitpy) 1683550 4 clopez 2020-08-27 18:54:05 -0700 Yes, i also wished to had some tests. I did manual tests as much as possible and it seems to work as expected. Thanks for the review ! :) 1683552 5 ews-feeder 2020-08-27 19:00:39 -0700 Committed r266267: <https://trac.webkit.org/changeset/266267> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407331. 1683553 6 webkit-bug-importer 2020-08-27 19:01:16 -0700 <rdar://problem/67911890> 407331 2020-08-26 13:35:36 -0700 2020-08-27 19:00:40 -0700 Patch bug-215863-20200826223534.patch text/plain 1705 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MTg3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQxYjg5MjI0MTU1OWVkNWI0NTU3Y2E1MDVjMmU4NjAx MjA3OWNiNy4uYTViMWM3ZDdhZWVkZmE4MjNjMWIwNGUxNmU0YmUxZTEyMGE4N2JlMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIwLTA4LTI2ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFt3ZWJraXRweV0gcmVwb3NpdG9yeSBzdm4gdmVyc2lvbiBpcyBp bmNvcnJlY3Qgd2hlbiB3b3JraW5nIG9uIGEgYnJhbmNoCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU4NjMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHdvcmtpbmcgb24gYSBTVk4gYnJhbmNoLCB0 aGUgaW5mb3JtYXRpb24gcG9pbnRlZCBpbiB0aGUgUmV2aXNpb24gZmllbGQKKyAgICAgICAgZG9l c24ndCByZWZsZWN0IHRoZSBsYXN0IGNoYW5nZSBvbiB0aGUgYnJhbmNoLCBidXQgdGhlIGxhc3Qg Y2hhbmdlIG9uIHRydW5rLgorICAgICAgICBJbnN0ZWFkIG9mIHBpY2tpbmcgdGhhdCBjaGFuZ2Vz ZXQsIHBpY2sgdGhlICJMYXN0IENoYW5nZWQgUmV2IiBvbmUgdGhhdCBzaG91bGQKKyAgICAgICAg cmVmbGVjdCB0aGUgbGFzdCBjaGFuZ2UgZG9uZSBpbiB0aGUgY3VycmVudCBjaGVja291dCAod29y a2luZyBkaXJlY3RvcnkpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL3N2bi5weToKKyAgICAgICAgKFNWTi5zdm5fcmV2aXNpb24pOgorCiAyMDIwLTA4 LTI2ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFRl c3RXZWJLaXRBUEkuQXVkaW9Sb3V0aW5nQXJiaXRyYXRpb24uRGVsZXRpb24gaXMgYSBjb25zdGFu dCBmYWlsdXJlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3N2bi5weQppbmRleCA2YmE0NThmZDEyMzM2OWZmMDUyZGRhODNlMWZjOTM1ZDEwMTU3OTcx Li4zNWQ2Zjg2OGRjNmVmYWJjNjQ0NGUxZTkzN2IxZjFiZDhkMmRhYjgyIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTI3NCw3 ICsyNzQsNyBAQCBjbGFzcyBTVk4oU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgcmV0dXJu ICJzdm4iCiAKICAgICBkZWYgc3ZuX3JldmlzaW9uKHNlbGYsIHBhdGgpOgotICAgICAgICByZXR1 cm4gc2VsZi52YWx1ZV9mcm9tX3N2bl9pbmZvKHBhdGgsICdSZXZpc2lvbicpCisgICAgICAgIHJl dHVybiBzZWxmLnZhbHVlX2Zyb21fc3ZuX2luZm8ocGF0aCwgJ0xhc3QgQ2hhbmdlZCBSZXYnKQog CiAgICAgZGVmIHN2bl9icmFuY2goc2VsZiwgcGF0aCk6CiAgICAgICAgIHJlbGF0aXZlX3VybCA9 IHNlbGYudmFsdWVfZnJvbV9zdm5faW5mbyhwYXRoLCAnUmVsYXRpdmUgVVJMJylbMjpdCg==