Skip to content

Sync dev with upstream (2026-09-09) - #10

Merged
pathanin merged 2 commits into
devfrom
sync-upstream-2026-09-09
Sep 8, 2026
Merged

pathanin merged 2 commits into
devfrom
sync-upstream-2026-09-09

Conversation

@pathanin

@pathanin pathanin commented Sep 8, 2026

Copy link
Copy Markdown
Owner

Sync dev with PathOfBuildingCommunity/PathOfBuilding-PoE2.

Merged from upstream

  • fd4c1acb7 Update spec — touches src/Export/spec.lua only (31 ins / 31 del).

Clean merge, no conflicts.

macOS port

Nothing needed forward-porting. Upstream's single file has no overlap with any fork-only patch.

Fork deltas verified present after the merge:

  • src/Launch.lua — jit.os == "OSX" → jit.off() block (7 lines) intact.
  • src/Classes/TradeQueryRequests.lua — pseudoModLine nil guard + its marker comment intact.
  • src/Classes/TradeQuery.lua — fork delta intact (14 ins / 56 del vs upstream).

Verification

  • P4 global assertion: git diff --stat <pre> HEAD lists only src/Export/spec.lua. No fork-only file appears.
  • P4 per-file: ground-truth git diff upstream/dev HEAD -- <file> confirms every live fork delta.
  • One stale signature, benign: commit a3e01e572's processLine marker comment about the dropped {fractured}/{crafted} prefix is absent because upstream has since adopted byte-identical processLine code. The fix is in the file; it is simply no longer a fork delta. Nothing restored.
  • P5: upstream added no versioned port directory this run. N/A.
  • Tests: busted is not installed locally, so the suite was not run here — relying on CI run_tests / check_modcache.

@pathanin
pathanin merged commit c6215be into dev Sep 8, 2026
5 checks passed
@pathanin
pathanin deleted the sync-upstream-2026-09-09 branch September 8, 2026 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant