You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 6f33ca0
Browse filesBrowse the repository at this point in the historyBrowse files
authored and
rsi-pr-agent
committed
feat(fork-sync): resolutions persist as git data between runs (#1849)
* feat(fork-sync): resolutions persist as git data between runs
Fork-Domain: fork-meta
Fork-Tier: core
* fix(fork-sync): exports keep every imported rerere id; fixups apply only to a fresh rebase
Fork-Domain: fork-meta
Fork-Tier: core
* fix(fork-sync): a kept worktree pins its imported resolution
Fork-Domain: fork-meta
Fork-Tier: core
* refactor(fork-sync): resolution transport moves out of the driver
Fork-Domain: fork-meta
Fork-Tier: core
---------
Co-authored-by: donjor <[email protected]>
The driver resolves every seam it can: local rerere replays resolutions within the run's rebase, and hook re-apply re-inserts marked fork hooks.
98
+
The driver resolves every seam it can: rerere replays resolutions from this rebase and [`sync/resolution`](#job-mode), and hook re-apply re-inserts marked fork hooks.
99
99
Only a `manual` row stops the run.
100
100
101
101
In the rebase, resolve minimally: upstream's text stands, and a marked fork hook goes back verbatim.
@@ -143,6 +143,31 @@ The body keeps its open-since date, target count, and last five runs; a clean ru
143
143
3.`git reset --hard <sha>`.
144
144
4. Rerun `vp run fork:sync <tag>`.
145
145
146
+
## Job mode
147
+
148
+
A job resolves a blocked sync without writing the trunk or the candidate.
149
+
It hands its resolutions to the next run as data on `sync/resolution`.
150
+
151
+
1. Run `vp run fork:sync <tag> --dry-run`
152
+
2. Resolve `manual` paths per [Conflict](#conflict)
153
+
3.`git add` them in the kept worktree; rerun
154
+
4. Repeat until the rebase finishes
155
+
5. Commit tip adaptation there; rerun once
156
+
6.`git update-ref --no-deref HEAD refs/fork-sync/resolution`
157
+
7. Report `committed`: rsi-pr-agent pushes `HEAD`
158
+
159
+
Every rebase rewrites `refs/fork-sync/resolution` before `ci`, so a `ci` failure in the job is expected.
160
+
It is one parentless commit:
161
+
162
+
```text
163
+
rr-cache/<id>/preimage one per resolved stop
164
+
rr-cache/<id>/postimage
165
+
fixups.mbox tip commits above the rebase
166
+
```
167
+
168
+
The next run imports it before it rebases: rerere replays each stop, and the fixups apply when its `Fork-Sync-Tag` matches.
0 commit comments