mozc submodule を upstream master へ rebase（263コミット追従）#2
Merged
unok merged 2 commits intoJun 12, 2026
Conversation
mozc fork を patch-myime-next として upstream/master (fea1ebace) に rebase。 docs/upstream-divergence.md の計画どおり: - 陳腐化パッチ破棄 (rules_cc/rules_python/rules_swift pin/ARM64/ノイズ/Insider暫定対応) - installer は upstream の universal installer 構造 + build_msi に移行 (UACインストーラ検出問題は upstream が改名で解決済み) - ConversionOptions API 移行 (ImmutableConverterInterface の変更追従) - fork 独自コミットは 14→11、既存ファイル差分はさらに縮小 - Mozc_x64.msi 生成まで検証済み (Bazel 9.0.2) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
Mozc サブモジュールを rebase 済みの新ブランチ patch-myime-next に切り替え、追従状況をドキュメントへ反映する変更です。
Changes:
docs/upstream-divergence.mdに、mozc fork の upstream/master への rebase 完了（2026-06-12）を追記.gitmodulesの mozc サブモジュール追従ブランチをpatch-myime→patch-myime-nextに更新
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| docs/upstream-divergence.md | mozc fork の rebase 状況を記録（ただしサマリ表の更新漏れあり） |
| .gitmodules | mozc サブモジュールの追従ブランチを patch-myime-next に変更 |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+15
to
+19
| ## 1. mozc fork（patch-myime → **patch-myime-next に rebase 済み、2026-06-12**） | ||
|
|
||
| **2026-06-12 に upstream/master（`fea1ebace`, 2026-06-11時点）へ rebase 完了。** 新ブランチ `patch-myime-next`（旧 `patch-myime` はバックアップタグ `patch-myime-backup-20260612` とともに温存。master マージ時に改名予定）。 | ||
|
|
||
| rebase 結果: fork 独自コミットは **14 → 11** にスリム化（27ファイル, +2272/-15 程度）。 |
Owner
Author
There was a problem hiding this comment.
修正しました（サマリ表を rebase 後の状態に更新、コミット数も実数に正確化）
Copilotレビュー指摘対応: サマリ表が rebase 前の数値 (patch-myime / 12コミット / 303遅れ) のままで §1 と矛盾していたのを修正。 コミット数の内訳も実数 (12) に正確化。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This was referenced Jun 12, 2026
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.
概要
PR #1 のスタックPR。docs/upstream-divergence.md §1 の計画に従い、mozc fork を upstream/master（
fea1ebace, 2026-06-11）へ rebase した。mozc fork 側（
patch-myime-nextブランチ）patch-myimeはそのまま温存（バックアップタグpatch-myime-backup-20260612も push 済み）。master マージ時に改名予定破棄したパッチ（陳腐化・計画どおり）
upstream 新構造への追従
--azookey_dll_dirをグラフト。installer_x64は後方互換 alias 化build_msi改名で解決済み（#1519）→ RunAsInvoker 回避は原理的に不要にImmutableConverterInterface::Convertの ConversionOptions API 移行Mozc_x64.msiを維持（myime ビルドスクリプト互換、PATCHEDコメント付き）保持した独立バグ修正
検証
bazelisk build //win32/installer:installer_x64（Bazel 9.0.2）→Mozc_x64.msi(84.9MB) 生成成功備考
scripts/prefill-bazel-repo-cache.ps1/scripts/bazel-fetch-loop.ps1は未追跡のまま（必要なら別途整理）🤖 Generated with Claude Code