Repository navigation
chore: 移植上游三个可独立应用的修复 - #31
Merged
Merged
Conversation
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.
方法
拿上游 36 个提交逐个
git cherry-pick -n试过(不提交,只看能否落地),只有三个干净。拿到的三个
c112a0bauth.rs一处取址逻辑442243finstall.shf65f806index.css一条规则共同点:都不碰我们改过的 schema,也不依赖他们的新表。
其余为何不能直接挑
上游这 36 个提交是一条链 —— 后续提交的上下文里含他们自己的祖先(分组 #51、主题设置 #50 等),所以在我们的树上必然冲突。特别是:
SCHEMA_VERSION=7(1..7),他们9(1..9),5/6/7 同号不同义 → 绝不能merge,会把 schema 搞坏api.rs/db.rs/main.rs/Admin.tsx/App.tsx结论:剩下值得要的(agent 上报限速
385c32f、主题包 gzip 校验fb4c4a4、安装器那一组)需要手工移植,一个提交一个 PR。验证
cargo test99 通过 ·cargo fmt --all --check干净 · 改动文件仅install.sh/agent_ws.rs/auth.rs/index.css。