Repository navigation
feat(线): 新增 line merge --abort 放弃未完成的合并 - #82
Merged
Merged
Conversation
带 journal 的 line merge / merge-into-base 中途被杀后,--abort 在 L1→L2 锁内先只读分类全部仓库,任一仓拒绝即零 Git、零 journal 写入。 遗留 MERGE_HEAD 用 git merge --abort(--dry-run 列出将丢弃的文件); 本地已提交、工作区干净、无 push 步骤且 origin 跟踪 ref 不含合并 tip 时用 reset --keep 撤回。回滚意图在首次 Git 突变前写入,中途崩溃 仍可再次 --abort。不做 --continue。 --recover 仍不改 Git:未确认的回滚意图不再判为 committed,已 aborted 的 op 不补成功 ledger 或事件。
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
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.
背景
带 journal 的
line merge/line merge-into-base如果在进程中途被杀,会留下未完成的 op:可能遗留MERGE_HEAD,也可能已经写了本地合并提交但还没收口。此前--recover只对账、不改 Git,操作者只能手动执行 git 命令。这次只做
--abort,不做--continue:冲突仍然在进程内整体回滚,不会留下可以继续的会话。改动
dyro line merge <目标线> --abort [OP_ID]与dyro line merge-into-base <线> --abort [OP_ID]:MERGE_HEAD且 HEAD 仍是original_head:执行git merge --abort。--dry-run列出将丢弃的文件(已暂存的合并结果和冲突文件),--yes执行。以下情况git merge --abort本身会失败,因此提前拒绝并列出相关文件:已合入的文件还有未暂存的手改,或合并删除的路径上出现了未跟踪的同名文件。git reset --keep <original_head>撤回:HEAD 等于 journal 里记录的合并 tip、工作区干净、journal 中该仓库没有 push 步骤、没有任何refs/remotes/origin/*包含该提交。already_included祖先核验失败、所有仓库都是already_included(没有可放弃的内容,提示改用--recover)。reset --keep的回滚意图在第一次 Git 突变之前写入。中途崩溃时,还没处理的仓库会被--recover判为unknown,op 保持打开,可以再执行一次--abort。unknown,其余仓库继续处理,最后报错并附上手动命令;全部成功则finish_op(aborted),并写一条 ledgerline_merge_aborted。--recover/--into/--from/--push互斥。--into合并的 op 记在父线上,所以 abort 时传父线。--recover仍然只对账、不改 Git,这次另有两处收紧:original_head就判为rolled_back,否则判为unknown。不再落到committed,避免把一次放弃的合并记成成功。aborted的 op 只报告状态,不补成功 ledger 或事件。此外,把
--recover与--abort共用的 op 选择和冻结选项校验抽成了_resolve_merge_op。验证
tests/test_line_merge_abort.py,共 22 项测试,覆盖上述各分支、两类崩溃窗口(reset --keep失败后执行 recover、多仓 abort 中途崩溃)以及 CLI。cli.py有一处两边各自新增函数的冲突,已保留双方。之后 merge、line push、next 契约与 CLI 相关的 162 项测试通过;ruff check src tests experiments无问题。already_included祖先核验、aborted op 不补成功、未跟踪同名文件、全already_included拒绝、MERGE_HEAD加 committed 拒绝。“先分类后突变”由test_two_repos_classify_before_mutate覆盖。已知残余风险(按裁决保留)
“远端是否已有该提交”只看本地
refs/remotes/origin/*,不 fetch。如果合并 tip 已经被推到远端,但本地跟踪 ref 过期,reset --keep仍可能撤回已发布的本地提交。范围外发现(未修改)
tests.test_console_inspection在机器高负载时(load average 50 以上)会偶发OVERVIEW_TIMEOUT;负载降下来后,在 main 和本分支上都能通过。