"Ready to merge" should do its thing only when newer than <fill in the blank> #164
Comments
Merged
elibarzilay
added a commit
that referenced
this issue
Aug 31, 2020
Send a few dates to `usersSayReadyToMerge`, which uses them to check for a comment with that content that was added *after* these dates. So, for example, if that comment was added and only later a review came in (that makes auto-merging possible), then that comment will be ignored. Note that this does *not* include comment dates, so even if someone posted a comment after the request (in the short time that the bot waits before acting), it will still get merged. Fixes #164.
elibarzilay
pushed a commit
to jablko/dt-mergebot
that referenced
this issue
Oct 16, 2020
Since DefinitelyTyped#190 we ignore "ready to merge" comments predating the most recent review. That change explicitly discounts the most recent comment date, so additional comments don't trample the "ready to merge" request, however additional approvals still do: DefinitelyTyped/DefinitelyTyped#48236 We can't drop the `lastReviewDate` from the `sinceDates` entirely without reopening DefinitelyTyped#164, demonstrated in DefinitelyTyped/DefinitelyTyped#46120, so the next simplest thing is to replace it with the earliest (non-stale) approval date. This works for DefinitelyTyped/DefinitelyTyped#46120 (continues to ignore requests preceding approval) and DefinitelyTyped/DefinitelyTyped#48236 (additional approvals don't trample requests, like additional comments don't).
elibarzilay
pushed a commit
that referenced
this issue
Oct 16, 2020
Since #190 we ignore "ready to merge" comments predating the most recent review. That change explicitly discounts the most recent comment date, so additional comments don't trample the "ready to merge" request, however additional approvals still do: DefinitelyTyped/DefinitelyTyped#48236 We can't drop the `lastReviewDate` from the `sinceDates` entirely without reopening #164, demonstrated in DefinitelyTyped/DefinitelyTyped#46120, so the next simplest thing is to replace it with the earliest (non-stale) approval date. This works for DefinitelyTyped/DefinitelyTyped#46120 (continues to ignore requests preceding approval) and DefinitelyTyped/DefinitelyTyped#48236 (additional approvals don't trample requests, like additional comments don't).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
In DefinitelyTyped/DefinitelyTyped#46120 the author said the magic line before an approval, and when the approval did come it immediately merged.
The test should check that the comment is newer than something. Most likely check that it's newer than the last PR update, but possibly also that it's newer than that and newer than a following invitation to merge.
The text was updated successfully, but these errors were encountered: