The GitHub Actions job "Backport Auto Label" on 
texera.git/ci/backport-rename-detection has succeeded.
Run started by GitHub user Yicong-Huang (triggered by Yicong-Huang).

Head commit for run:
1c0fc5701111bec48865d119704d43c97c645844 / Yicong Huang 
<[email protected]>
ci: harden backport cherry-pick against package/directory renames

Both backport scripts invoke `git cherry-pick` bare, leaving three merge
knobs at defaults that misbehave when a package/directory rename lands
between main and a release branch:

- merge.renameLimit / diff.renameLimit: Git silently skips inexact rename
  detection once unpaired paths exceed the limit, so renamed files degrade
  to deleted+added and picked hunks hit paths that no longer exist.
- merge.directoryRenames (default `conflict`): files a backport *adds*
  under an old package path are not auto-placed into the renamed directory.
- rename-threshold: a rename that also rewrites package/import lines can
  drop a small file below the 50% default and be missed.

Wrap both cherry-picks (preflight and fallback-branch) identically with
raised rename limits, directory-rename detection, and a 40% threshold so a
green preflight and the branch it later builds cannot disagree. Pure
config passthrough to the merge machinery; no logic change.

Closes #6963

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>

Report URL: https://github.com/apache/texera/actions/runs/30331272717

With regards,
GitHub Actions via GitBox

Reply via email to