RESOLVED FIXED 224251
[webkitscmpy] Handle multiple double-branch commits 
https://bugs.webkit.org/show_bug.cgi?id=224251
Summary [webkitscmpy] Handle multiple double-branch commits
Jonathan Bedard
Reported 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.
Attachments
Patch (5.46 KB, patch)
2021-04-06 16:04 PDT, Jonathan Bedard 		no flags
DetailsFormatted DiffDiff
Patch for landing (5.87 KB, patch)
2021-04-07 14:37 PDT, Jonathan Bedard 		no flags
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Radar WebKit Bug Importer
Comment 1 2021-04-06 16:02:26 PDT
<rdar://problem/76288547>
Jonathan Bedard
Comment 2 2021-04-06 16:04:36 PDT
Created attachment 425333 [details] Patch
dewei_zhu
Comment 3 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?
dewei_zhu
Comment 4 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.
Jonathan Bedard
Comment 5 2021-04-07 14:37:33 PDT
Created attachment 425439 [details] Patch for landing
EWS
Comment 6 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].
Note You need to log in before you can comment on or make changes to this bug.