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.
<rdar://problem/76288547>
Created attachment 425333 [details] Patch
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 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.
Created attachment 425439 [details] Patch for landing
Committed r275635: <https://commits.webkit.org/r275635> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425439 [details].