feat(api/base): add PROMOTE merge strategy#266
Merged
Conversation
## Summary ### Why? Stovepipe promotes an already-verified commit onto a verified branch (e.g. `verified/main`) as-is. The existing `REBASE`/`SQUASH_REBASE`/`MERGE` strategies cannot express this — they all transform the change and produce new revisions. We need a shared, VCS-neutral way for a client to ask Runway to advance a branch to an already-existing commit. ### What? Adds `PROMOTE` (= 4) to the shared `Strategy` enum in `api/base/mergestrategy` and the matching `MergeStrategyPromote` Go entity constant in `platform/base/mergestrategy`. `PROMOTE` means "integrate the exact revision as-is, with no content transform": each backend realizes it natively (git fast-forward, Mercurial bookmark advance, Subversion/Perforce copy), so a step's output revision is the same commit the request named rather than a freshly created one. The Runway merge-queue contract README gains a "Merge strategy" section documenting the semantics. This is contract + docs only — no producer or consumer wiring is added yet. ## Test Plan ✅ `make proto` (regenerated `api/base/mergestrategy/protopb`) ✅ `bazel build //api/base/mergestrategy/protopb //platform/base/mergestrategy` Co-authored-by: Cursor <cursoragent@cursor.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
Why?
Stovepipe promotes an already-verified commit onto a verified branch (e.g.
verified/main) as-is. The existingREBASE/SQUASH_REBASE/MERGEstrategies cannot express this — they all transform the change and produce new revisions. We need a shared, VCS-neutral way for a client to ask Runway to advance a branch to an already-existing commit.What?
Adds
PROMOTE(= 4) to the sharedStrategyenum inapi/base/mergestrategyand the matchingMergeStrategyPromoteGo entity constant inplatform/base/mergestrategy.PROMOTEmeans "integrate the exact revision as-is, with no content transform": each backend realizes it natively (git fast-forward, Mercurial bookmark advance, Subversion/Perforce copy), so a step's output revision is the same commit the request named rather than a freshly created one. The Runway merge-queue contract README gains a "Merge strategy" section documenting the semantics.This is contract + docs only — no producer or consumer wiring is added yet.
Test Plan
✅
make proto(regeneratedapi/base/mergestrategy/protopb)✅
bazel build //api/base/mergestrategy/protopb //platform/base/mergestrategyCo-authored-by: Cursor cursoragent@cursor.com