You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
create a new repo on Github
push a new branch
on GitHub, create a PR for that branch and merge it with "rebase merge" (delete the branch to avoid a divergent change-id later)
run jj git fetch to fetch the rebased commit
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.
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.
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.jj git fetch
to fetch the rebased commitjj 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
The text was updated successfully, but these errors were encountered: