Skip to content

Fetching a rebased change-id nukes its evolog #6326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
senekor opened this issue Apr 12, 2025 · 1 comment
Open

Fetching a rebased change-id nukes its evolog #6326

senekor opened this issue Apr 12, 2025 · 1 comment
Labels
enhancement New feature or request

Comments

@senekor
Copy link
Contributor

senekor commented Apr 12, 2025

Description

When commits are rebased on a remote with git-replay (for example with GitHub's rebase-merge) and these commits are then fetched again, their previous evolog is nuked.

Steps to Reproduce the Problem

Set git.write-change-id-header = true in your config.

  1. create a new repo on Github
  2. push a new branch
  3. on GitHub, create a PR for that branch and merge it with "rebase merge" (delete the branch to avoid a divergent change-id later)
  4. run jj git fetch to fetch the rebased commit
  5. run jj evolog -r <change-id>

Expected Behavior

The evolog should include the previous entries from before the rebased commit was fetched.

Actual Behavior

The evolog is nuked and the only entry is the one from the rebased commit, as if it was a completely new one.

Specifications

  • Platform: Linux
  • Version: jj 0.28.2-fbaa51b4cecb0602fd9ae1e95922e3ab672138dd
@yuja
Copy link
Contributor

yuja commented Apr 13, 2025

Evolution history and change id are separate things as of now. We'll need to either produce fake predecessor links on fetch/import or redesign evolution log to respect operation history.

@yuja yuja added the enhancement New feature or request label Apr 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants