Answer stability round 1: 1 🔴, 5 🟡 (0 misread); hold a pull request's base on the forge to the recorded one, ask origin for the epic branch, and name where a chunk's work landed
CI / tests (pull_request) Successful in 3m46s
CI / tests (pull_request) Successful in 3m46s
This commit is contained in:
+2
-1
@@ -166,8 +166,9 @@ Valid while `~/.claude` is a checkout of this repo.
|
||||
|
||||
- **The setting.** `epic-branch` in a project's config is a template with `{epic}` for the epic's key, such as `"{epic}"`. Left out, everything works as before. Under chunk-preflight the key is that of the Jira epic `plan` names, so a plan kept in a file has no working branch. Under do-epic it is the key of the epic do-epic drives.
|
||||
- **A chunk's base is recorded in git.** `git config branch.<chunk's branch>.chunk-base <epic's working branch>`, in the checkout's shared config (`git_repo.CHUNK_BASE`). `git_repo.default_ref` answers `origin/<epic's working branch>` on such a branch, so each tool that measures a chunk against its base reads the chunk's own commits. Deleting the branch removes the record.
|
||||
- **The branch stays level by a merge commit, made without a checkout.** `epic_branch.levelled` makes the branch on origin off the default branch, or merges the default branch into it with `git merge-tree --write-tree`, which needs git 2.38 or later, and `git commit-tree`, and pushes without force. chunk-preflight runs it before it makes a chunk's worktree, do-epic as a chunk's window starts, and `chunk-pr open-epic` before it opens the epic's pull request. `open-epic` refuses where origin has no such branch, since a branch made there would be a stray one. A conflict stops the chunk and asks a person to merge by hand: a resolution picks between two teams' changes, which is theirs to pick.
|
||||
- **The branch stays level by a merge commit, made without a checkout.** `epic_branch.levelled` makes the branch on origin off the default branch, or merges the default branch into it with `git merge-tree --write-tree`, which needs git 2.38 or later, and `git commit-tree`, and pushes without force. It asks origin itself whether it has the branch, with `git ls-remote`, since a fetch keeps a checkout's `origin/<branch>` after origin deleted the branch. So a chunk that starts after the epic's branch merged and was deleted gets a fresh branch off the default branch, never the commits the deleted one held. chunk-preflight runs it before it makes a chunk's worktree, do-epic as a chunk's window starts, and `chunk-pr open-epic` before it opens the epic's pull request. `open-epic` refuses where origin has no such branch, since a branch made there would be a stray one. A conflict stops the chunk and asks a person to merge by hand: a resolution picks between two teams' changes, which is theirs to pick.
|
||||
- **The chunk merges without a person.** `chunk-pr merge` into an epic's working branch ignores `merge = "human"` and `wait-for-approval`, and do-epic parks no such chunk on a person's merge. lilleman's call: the team's rule against merging without a go-ahead covers the default branch and protected branches. The pull request from the epic's working branch into the default branch is opened ready and never merged by the loop. do-epic's finishing chunk opens it with `chunk-pr open-epic`; under loop-claude the human runs that command.
|
||||
- **The forge's base must agree with the recorded one.** The record says whether a person merges, and the forge says where the pull request lands, so the two must not differ. `chunk-pr ready` and `merge`, and do-epic's gate, read the pull request's base from the forge (`forge.pulls.other_base`). They fail, naming both branches, where it differs from the recorded base, or from the default branch where the checkout records none. A person then changes the pull request's base on the forge, or the record. chunk-preflight and do-epic record the base for a chunk they continue too, since the setting sends every chunk of the epic into the working branch. So a pull request that was open into the default branch when the setting was turned on fails this check until a person changes its base or merges it. do-epic parks a chunk, and moves its issue, by the base it recorded as the chunk's window started, never by the config alone.
|
||||
- **A review is asked for by a comment.** An auto-reviewer may review on its own only pull requests into the default branch. `review-request-comment` holds the comment that asks it, which `chunk-pr ready` and `chunk-pr push` post on a pull request into an epic's working branch. The worker waits for the review as for any auto-reviewer.
|
||||
- **do-epic moves the issue itself.** A team's automation fires only for pull requests into the default branch. `jira-pull-request-open-status` names the status of an issue whose chunk parks with its pull request open, and `jira-pull-request-merged-status` the one once it has merged. The first move is made as the chunk parks, since that is where do-epic learns of the pull request; one that opens and merges within a single run of the worker skips it. Where the workflow then offers no way straight to the merged status, do-epic moves the issue through the open status first. Each setting names a status, and do-epic takes whichever transition leads there.
|
||||
- **An issue at the merged status counts as done for the epic's end.** The release reviews and the finishing chunk come before a person merges the epic's working branch, and Jira counts the issues done only after. So `finish.landed` reads such an issue as done, wherever do-epic's config names the status. Without the setting, the finishing waits for Jira as before.
|
||||
|
||||
Reference in New Issue
Block a user