From patchwork Wed Dec 17 02:26:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 941 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765938462; bh=XHJt78bfL3ml/+QTzB22fMBd2YaPCDhjtABObciaA5c=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XDLjQMgUfOnO/Czqtm79IG/gePn91qM9o/vmenaJOr+Hui00nfH5NrljlKP5k/L+X QPD96cd5PO8O9/fFTDQLS780/Xsqp3q4dOCVPx4lzBzuw+G+/DUwtVQGHkLH45uNEJ OwWYR/5002kbKI2hJfhFxl5K/93C+S/cG6awdckYYWQ9vKCXJvD8HAcR0RIDs+LDP3 LaV7FZKFT4EPDt3yaN9kZgr9eOmbbU9RwsEus0ye7gpa1xjWSBuQKJH4IlmuN+0uY8 bgzqKlGHYiCsQpctFQkrphJ1pB1jZIHntdKSAPAmCTmZIkOIu/YUtjpeC+SMTyybvr O+fbIZmBy1vwg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4576668ABD for ; Tue, 16 Dec 2025 19:27:42 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id qEmlOi4DM0pQ for ; Tue, 16 Dec 2025 19:27:42 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765938462; bh=XHJt78bfL3ml/+QTzB22fMBd2YaPCDhjtABObciaA5c=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XDLjQMgUfOnO/Czqtm79IG/gePn91qM9o/vmenaJOr+Hui00nfH5NrljlKP5k/L+X QPD96cd5PO8O9/fFTDQLS780/Xsqp3q4dOCVPx4lzBzuw+G+/DUwtVQGHkLH45uNEJ OwWYR/5002kbKI2hJfhFxl5K/93C+S/cG6awdckYYWQ9vKCXJvD8HAcR0RIDs+LDP3 LaV7FZKFT4EPDt3yaN9kZgr9eOmbbU9RwsEus0ye7gpa1xjWSBuQKJH4IlmuN+0uY8 bgzqKlGHYiCsQpctFQkrphJ1pB1jZIHntdKSAPAmCTmZIkOIu/YUtjpeC+SMTyybvr O+fbIZmBy1vwg== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 3303468AFF for ; Tue, 16 Dec 2025 19:27:42 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765938460; bh=85KJoSCbdee9r344GHDnZUAzabr4gORt4c4I3oHxQfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eoTQYfJD7yk9GnYLQ3OFNdt8e2OQDvL4nJreDen4yiMb+3lef028Gt38opQC7+0F5 5M1oDFcPphiGB5+HtZwrgoLt48xVm4W0VQzPvrn3Hf/di9OBg2pCSbqAODHcA0Dpj3 itzwayEjQam0QJaWXGfJo3BlVmNFWm3PDd2KuNraONEWZTBruTJxgUIHs2KwJZo1vI R8eg1AVIe/lOkXs47YfDfUvYXT/FA2rN6oll63lhTXTlwsLz5MwOBGiunEqZg2BU8h xax7zkZOasK+tsiKBifPM70mYm7ypY8TuD/wXiraShYCJvE9zFHaW96WnOtWFkHDMQ mEYDgvgxRwfvw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 3614168AEE; Tue, 16 Dec 2025 19:27:40 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id OLqTai2aj7Oc; Tue, 16 Dec 2025 19:27:40 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765938454; bh=4xiVdhZd6zxoNSCYPzpJeFlhFl1BdU0kArL8HPYGjG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v5SpDSDTokQTkGffJCEXscPUOTDXxtQzVaeOleKvG1X/C9BKiC6cvfWeGXlDvvZz7 +nalY4jEXu5VipXqua9VF9ubwLisKQvTgbpv9Jbq8qQXXVDhY36oJTCml0frvODv+n KN6jkHXSNUCP9CG/sKBKhoLM0Vk+OebrfgVNVpuDle98uLUOnnviesOFuBoQBq2etd eziw6NNElZy+4a4Sc7l5OMTP81w6IPOWrKWCSWLi1rr73txcXtEjDDOt0VV4h+f1Tf IfpxUCE24AfQxbJto3gYC5hrELbqLTSdfUC7YyWHj6zRJooq8IGqx3pOzhAc/QddgE OEOtqe+1qjOjA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 4FF2468BB8; Tue, 16 Dec 2025 19:27:34 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Tue, 16 Dec 2025 19:26:03 -0700 Message-ID: <20251217022611.389379-16-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251217022611.389379-1-sjg@u-boot.org> References: <20251217022611.389379-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: OP5EQ5NQAH36GCSA4JL2QICKXPNGFNGQ X-Message-ID-Hash: OP5EQ5NQAH36GCSA4JL2QICKXPNGFNGQ X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass , "Claude Opus 4 . 5" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 15/17] pickman: Add workflow overview to documentation List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Add a workflow section at the top of the README explaining the typical usage pattern for pickman: setup with add-source, cherry-pick with apply -p, review/merge, update with commit-source, and repeat. Also mention the step and review commands for automated workflows. Co-developed-by: Claude Opus 4.5 Signed-off-by: Simon Glass --- tools/pickman/README.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools/pickman/README.rst b/tools/pickman/README.rst index 0d2c55e762a..7a33378a32b 100644 --- a/tools/pickman/README.rst +++ b/tools/pickman/README.rst @@ -8,6 +8,27 @@ Pickman - Cherry-pick Manager Pickman is a tool to help manage cherry-picking commits between branches. +Workflow +-------- + +The typical workflow for using pickman is: + +1. **Setup**: Add a source branch to track with ``add-source``. This records the + starting point (merge-base) for cherry-picking. + +2. **Cherry-pick**: Run ``apply -p`` to cherry-pick the next set of commits (up + to the next merge commit) and create a GitLab MR. A Claude agent handles the + cherry-picks automatically, resolving simple conflicts. + +3. **Review**: Once the MR is reviewed and merged, run ``commit-source`` to + update the database with the last processed commit. + +4. **Repeat**: Go back to step 2 until all commits are cherry-picked. + +For automated workflows, use ``step`` instead of ``apply -p``. It checks for +open pickman MRs first and only creates a new one if none are pending. Use +``review`` to have the agent address MR comments. + Usage -----