Skip to content

Review upstream Zed v1.8.2 #46

Description

@github-actions

Upstream Release

Minor version upgrade — new minor line (v1.5.4 → v1.8.2)

Previous Reviewed Release

  • Zed tag: v1.5.4
  • Upstream commit: 193b55aa3aa71accf0dcd78709ee164a8ca42d54

Stable Branch

New stable branch to create: stable/v1.8 — old branch stable/v1.5 should be deleted. Upstream never patches an old minor once a new one exists, so it is a permanent dead end.

stable/v1.8 is created clean from the upstream tag. main is updated by cherry-picking all upstream commits from v1.5.4 to v1.8.2 — same as a patch but larger. NeoZed-specific commits already on main stay as-is; resolve any conflicts in favor of keeping NeoZed customizations while taking upstream functional changes.

Commits in Range

All commits below are already upstream-vetted stable commits and should be taken in full.

Rules

  • Take all commits — do not cherry-pick selectively.
  • Do not merge upstream branches directly; cherry-pick the range onto the target branches.
  • Leave upstream commit messages unchanged.
  • On main, resolve conflicts in favor of keeping NeoZed customizations while taking upstream functional changes.
  • Review the resulting diff before opening PRs for accidental upstream identity regressions, duplicated/conflicting code, stale .zed paths, and lost NeoZed customizations.
  • NeoZed maintains exactly one active stable branch. On a minor upgrade, the old stable branch is marked inactive; deletion requires explicit human approval.

Required Verification

  • All commits applied to stable/v1.8
  • All commits applied to main
  • Conflicts on main resolved, NeoZed customizations preserved
  • Resulting main diff reviewed for identity regressions, code duplication, and stale upstream-only paths
  • cargo check --workspace --all-targets passes before any PR is opened
  • script/neozed/upstream-reviewed-tag updated to v1.8.2 and merged
  • (Minor only) stable/v1.5 deleted

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions