← Back to issue list

chore(merge): merge 'hotfix/1.1' back to main

View original Github issue

Metadata

Project
rockcraft
Number
#470
Type
pull request
State
closed
Author
tigarmo
Labels
—
Created
Updated
Closed

Current evaluation

Back-merge PR of hotfix/1.1 into main was approved by tigarmo but closed with an empty diff (0 files changed), leaving the 1.1 maintenance fixes integrated another way.

Resolution: closed stale

Reason: PR #470 was opened only to merge hotfix/1.1 back into main; it shows an approved review but an empty diff (+0/-0) and was closed rather than merged, with no comments or CI activity explaining why. Equivalent 1.1.x fix work (e.g. the Chisel spread-test cherry-pick in #469/#466) landed on the hotfix branch independently, so the back-merge PR was abandoned by the maintainer without resolution.

Evaluated by: mr-cal-bot

No scores available.

Issue body

- [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? -----

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed stale Back-merge PR of hotfix/1.1 into main was approved by tigarmo but closed with an empty diff (0 files changed), leaving the 1.1 maintenance fixes integrated another way.
stealth/space-bunny-alpha — closed resolved hotfix/1.1 was merged back into main by maintainer tigarmo; the approved PR was closed with no file changes.
qwen/qwen3.6-35b-a3b — — Closed after routine merge of 'hotfix/1.1' back to main. Approved by one reviewer with zero code changes, indicating a straightforward merge operation.
qwen3.6-35b-a3b-mtp-q6 — — Merged hotfix/1.1 into main. The pull request was closed following successful integration, finalizing the version 1.1 release.

Update history

No update history recorded yet.

Related work

  • Related To: canonical/rockcraft#469 (confidence 70%)

    Merged the Chisel fix cherry-picked into the 1.1.2 hotfix branch (#466, b3bc4d70), one of the changes the back-merge PR #470 targeted.

  • Related To: canonical/rockcraft#500 (confidence 45%)

    Later hotfix/1.2 back-merge into main that was actually merged, showing the project's normal pattern for these merges.

  • Related To: canonical/rockcraft#471 (confidence 30%)

    Adjacent schema fix merged just after #470; part of the same 1.1 maintenance line but not the back-merge itself.

Related issues

Issue Project State Summary Similarity
#511 chore(merge): merge 'hotfix/1.2' back into 'main' rockcraft merged Merged hotfix/1.2 back into main via PR #511 (commit 0ef121f3), bringing the 1.2 maintenance fixes forward with two approvals.
93%
#500 chore(merge): merge 'hotfix/1.2' back into 'main' rockcraft merged Merged PR #500 back-merged hotfix/1.2 into main after approval by two reviewers, with no unresolved comments.
92%
#630 chore(merge): 'hotfix/1.5' into 'main' rockcraft merged Merged hotfix/1.5 into main via PR #630 at commit 1a5740ad after two approvals; 4 files changed (+13/-12).
91%
#491 chore(merge): merge 'hotfix/1.2' back to 'main' rockcraft merged Merged hotfix/1.2 back into main via #491 (commit bd69420e), with two approvals.
91%
#563 chore(merge): 'hotfix/1.3' into 'main' rockcraft merged Merged hotfix/1.3 into main in commit 5200e42, with no net file changes; the PR received two approvals.
90%
#558 chore: merge 'hotfix/1.3' back into 'main' rockcraft merged Merged hotfix/1.3 back into main via PR #558, integrating the maintenance branch into the main line.
90%
#1394 chore(merge): merge hotfix/1.21 back to main rockcraft merged Merged hotfix/1.21 branch back into main to propagate recent fixes to the development branch.
90%
#537 chore(merge): 'hotfix/1.20' into 'main' craft-providers merged Merged hotfix/1.20 into main via commit 0b1d043 (#537), bringing the approved hotfix branch into the main line.
89%
#478 chore(merge): merge 'hotfix-1.1' into 'main' rockcraft closed Closed unmerged: #478 was an empty, mis-targeted hotfix merge. The follow-up #491 merged hotfix/1.2 back into main.
88%
#924 chore(merge): hotfix/2.1 into main craft-parts closed Merged hotfix/2.1 into main through PR #924, carrying 10 changed files (+50/-16).
88%