Repository navigation
fix(线): line merge --into --push 推送后再结案并写入远端锚点 - #78
Merged
Merged
Conversation
0.7.17 起 line merge --into 走带 journal 的路径,但该路径在推送之前就把操作标为 completed,并按请求参数在账本里写 pushed=true;推送循环也从未调用 record_remote_anchor,成功推送后父线清单不会写入 schema 4 的 [remote_anchors]。推送失败或进程中途退出时,账本与远端状态不符,同一主体也不再被拦截。 现在每个仓库的推送在 journal 中有独立步骤:推送前记录意图,成功后先写远端锚点再记录 pushed,失败记录 push_failed,其后未尝试的仓库记录 not_attempted;成功账本按每个仓库的实际推送结果写入,全部推送结果落盘后才结案。已知推送失败会照常报错并结案,重跑同一命令即可继续推送并补写锚点。推送中途进程退出时操作保持未完成并拦截同主体;--recover 将缺结果的推送报告为 unknown 并给出手动推送命令,不执行任何 Git 写入,也不写锚点。未请求 --push 时行为不变。
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
# Conflicts: # CHANGELOG.md
Merged
This branch had an error being deployed
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
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.
问题(0.7.17 回归)
dyro line merge <子线> --into <父线> --push在 0.7.17 改走带 journal 的路径_run_journaled_line_merge,该路径:finish_op(completed),并按请求参数在成功账本里写pushed=true;推送失败或进程中途退出时,账本与远端不符,同一主体也不再被拦截。record_remote_anchor,成功推送也不写 schema 4 的[remote_anchors],与 0.7.17 CHANGELOG 及推送契约不符。line sync --push、task merge --push走的旧路径不受影响。修复
pushed;失败记录push_failed;其后未尝试的仓库记录not_attempted。already_included)继续推送并补写锚点。--recover把缺结果的推送报告为unknown并给出手动推送命令,不执行任何 Git 写入,也不写锚点。finish_op只放宽一种情况:merge操作、请求了推送、仓库合并结果为committed/already_included、推送结果为unknown。缺结果、pending、合并步骤的unknown仍拒绝结案。--push时行为不变;--from、merge-into-base仍拒绝--push。验证
tests.test_line_ops tests.test_line_next_contract tests.test_line_retire tests.test_line_merge_cross:114 项通过。test_package_version_matches_pyproject失败(本地共享 venv 元数据仍为 0.7.16,与本修复无关)。ruff check src tests experiments:通过。已知边界(条件性风险)
推送成功后若写锚点时读取 HEAD 失败,该仓库保持"有意图无结果",
--recover报unknown;需再跑一次line merge --into --push补写锚点。