From 54775bb701152746f0bd9b696d2cd6d6ceb329b2 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Thu, 14 Aug 2025 19:08:06 +0100 Subject: [PATCH] appview/pulls: do not mark merged PRs as abandoned upon resubmit Change-Id: nnuvlyptxsqymnxkluoozvrvnnlppqzp Signed-off-by: oppiliappan --- appview/pulls/pulls.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go index ddff2e6a..b28cc53e 100644 --- a/appview/pulls/pulls.go +++ b/appview/pulls/pulls.go @@ -1713,6 +1713,11 @@ func (s *Pulls) resubmitStackedPullHelper( // deleted pulls are marked as deleted in the DB for _, p := range deletions { + // do not do delete already merged PRs + if p.State == db.PullMerged { + continue + } + err := db.DeletePull(tx, p.RepoAt, p.PullId) if err != nil { log.Println("failed to delete pull", err, p.PullId) @@ -1753,6 +1758,11 @@ func (s *Pulls) resubmitStackedPullHelper( op, _ := origById[id] np, _ := newById[id] + // do not update already merged PRs + if op.State == db.PullMerged { + continue + } + submission := np.Submissions[np.LastRoundNumber()] // resubmit the old pull -- 2.43.0