This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d339ac4cf708 CAMEL-24492: Document that backport PRs need no reviewers
and can be merged as-is
d339ac4cf708 is described below
commit d339ac4cf708196523d1495eadd214569acddc07
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Aug 26 12:39:35 2026 +0200
CAMEL-24492: Document that backport PRs need no reviewers and can be merged
as-is
A backport PR that cherry-picks an already-reviewed, already-merged main PR
onto an LTS maintenance branch duplicates review effort for no benefit if it
requires fresh reviewers before merging. AGENTS.md now documents that such
PRs must not be assigned reviewers and may be merged once CI is green,
without a new human approval — unless the backport needed manual conflict
resolution beyond a mechanical cherry-pick, in which case normal review
applies. Also cross-references the exception from "PR Reviewers", "Merge
Requirements", and "Merge Procedure" step 5, and adds a concrete `gh pr
diff`
snippet for verifying a backport is a straight cherry-pick.
Closes #25749
Co-authored-by: Claude Sonnet 5 <[email protected]>
---
AGENTS.md | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/AGENTS.md b/AGENTS.md
index 0c2c1ef1aa48..d9b14c20b0cd 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -75,6 +75,30 @@ marked ready for review.
- For cross-cutting changes (core, API), include committers with broader
project knowledge.
- Request review from **at least 2 relevant committers** using `gh pr edit
--add-reviewer`.
- When all comments on the Pull Request are addressed (by providing a fix or
providing more explanation) and the PR checks are green, re-request review on
existing reviewers so that they are aware that the new changeset is ready to be
reviewed.
+- **Exception — backport PRs:** do not request reviewers on a PR that is a
straight backport
+ (cherry-pick) of a PR already reviewed and merged on `main`. See "Backport
PRs" below.
+
+### Backport PRs
+
+A backport PR that cherry-picks a commit from a PR already reviewed and merged
on `main` onto an
+older LTS maintenance branch (e.g. `camel-4.14.x`, `camel-4.18.x`) does not
need a fresh review —
+the code change already went through human review on the PR it was backported
from.
+
+- A backport PR MUST NOT be assigned any reviewers.
+- A backport PR MAY be merged as-is, once CI is green, without waiting for a
new human approval.
+ This is the one exception to the "at least one human approval" rule in
"Merge Requirements" below.
+- This exception applies only to straight cherry-picks. If a backport required
manual conflict
+ resolution that changed the code beyond a mechanical port, treat it as a
normal PR and request
+ review.
+- **Verifying a straight cherry-pick:** diff the backport PR against the
original PR it was
+ cherry-picked from — an empty (or whitespace/context-only) diff confirms a
mechanical port.
+ ```bash
+ gh pr diff <backport-pr> --repo apache/camel > /tmp/backport.diff
+ gh pr diff <original-pr> --repo apache/camel > /tmp/original.diff
+ diff /tmp/backport.diff /tmp/original.diff
+ ```
+ Any semantic difference means the backport diverged from the original —
treat it as a normal
+ PR and request review.
### Doing a review
@@ -87,7 +111,8 @@ When an AI agent is doing a review:
### Merge Requirements
- An agent MUST NOT merge a PR if there are any **unresolved review
conversations**.
-- An agent MUST NOT merge a PR without at least **one human approval**.
+- An agent MUST NOT merge a PR without at least **one human approval**
+ (exception: backport PRs — see "Backport PRs" above).
- An agent MUST NOT approve its own PRs — human review is always required.
### Merge Procedure
@@ -125,6 +150,8 @@ When merging a PR, an agent MUST perform the following
steps **in order**:
5. **Merge the PR**:
- Verify all merge requirements above are satisfied (human approval, no
unresolved conversations).
+ Exception: a straight-cherry-pick backport PR (see "Backport PRs" above)
may be merged without
+ a new human approval once CI is green.
- If any commit in the PR was AI-assisted, the squash-merge commit message
MUST include the
AI co-authorship trailer (e.g., `Co-authored-by: Claude Opus 4.6
<[email protected]>`).
- Merge the PR: `gh pr merge <PR> --squash` (or `--merge` / `--rebase` as
appropriate).
