Bug 224251

Summary: [webkitscmpy] Handle multiple double-branch commits
Product: WebKit Reporter: Jonathan Bedard <jbedard>
Component: Tools / TestsAssignee: Jonathan Bedard <jbedard>
Status: RESOLVED FIXED    
Severity: Normal CC: aakash_jain, dewei_zhu, slewis, webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch for landing none

Description Jonathan Bedard 2021-04-06 15:59:20 PDT 
There are a few cases, namely on the safari-607-branch, where some commits where made both on trunk and on a branch. In one notable case, two sequential commits were made this way. Our current code handles 1 commit made on multiple branches, we apparently need to handle more than that.
Comment 1 Radar WebKit Bug Importer 2021-04-06 16:02:26 PDT 
<rdar://problem/76288547>
Comment 2 Jonathan Bedard 2021-04-06 16:04:36 PDT 
Created attachment 425333 [details]
Patch
Comment 3 dewei_zhu 2021-04-06 21:09:39 PDT 
Comment on attachment 425333 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=425333&action=review

> Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:184
> +                            if default_count > 2:

Are we making an assumption here that there will not be more than two consecutive commits made to both on trunk and branch?
Comment 4 dewei_zhu 2021-04-07 13:22:50 PDT 
Comment on attachment 425333 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=425333&action=review

r=me

>> Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:184
>> +                            if default_count > 2:
> 
> Are we making an assumption here that there will not be more than two consecutive commits made to both on trunk and branch?

Discussed in person, we should probably add a comment to record this assumption. And potentially increase the number. So far, 2 should work.
Comment 5 Jonathan Bedard 2021-04-07 14:37:33 PDT 
Created attachment 425439 [details]
Patch for landing
Comment 6 EWS 2021-04-07 15:25:25 PDT 
Committed r275635: <https://commits.webkit.org/r275635>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 425439 [details].