Repository navigation
FIX-1927: a local checkout's run starts from the current base, not a stale main #3201
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
3ce6403
feat(workspace): a local checkout's new run starts from the newer of …
claude 48782a6
fix(harness-manager): readRunCommits leaves out the base's upstream (…
claude 2348dbd
docs: a local checkout fetches its upstream before a new run (FIX-1927)
claude cc6c9c0
docs: tighten the fetch-before-cut docs after a docs-editor pass
claude 047ec05
fix(workspace): pin a listed checkout's upstream URL and ignore its p…
claude 6dfdd31
fix(workspace): record HEAD's branch as a local run's base, so its co…
claude ef5d129
fix(workspace): fetch the upstream branch pinned at start, and cut at…
claude a6378b8
fix(workspace): fetch in an isolated repository, read HEAD's branch o…
claude 181cfe5
fix(workspace): count a run's commits from its recorded base alone, a…
claude e11bc5c
fix(workspace): record HEAD as asked again, and fall back when the fe…
claude 8d80e63
fix(workspace): fall back when the fetched tracking ref is locked, an…
claude 2ddc227
fix(workspace): move only the tracking ref itself after a fetch, neve…
claude 0fad1ea
docs(workspace): say branch upstreams are pinned at start, name the c…
claude ce28ffa
fix(workspace): make the fetch scratch cleanup best effort so it neve…
claude File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
docs: a local checkout fetches its upstream before a new run (FIX-1927)
Shift Manager overview and README, Workforce projects guide, workspace README (base-diverged refusal), Lab profile comments, and the changeset (workspace minor, harness-manager patch). Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GJ9UL2RHLrxJsiGFnkuxjt
- Loading branch information
commit 2348dbd6b9cb7bca7892a8a08d94062016ef66fc
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| "@flow-state-dev/workspace": minor | ||
| "@flow-state-dev/harness-manager": patch | ||
| --- | ||
|
|
||
| A repository listed in `localRepositories` now fetches the base's upstream before it cuts a new run's branch, and cuts from whichever of local and upstream is newer. A base whose local and upstream copies have each moved is refused as `base-diverged`; a failed fetch falls back to the last-fetched copy with a warning. `place.repo.baseCommit` is now set for these repositories, and `readRunCommits` also leaves out the base's upstream (FIX-1927). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.