Skip to content
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

cli: reload both repo and wc commit if working copy was updated #1617

Merged
merged 2 commits into from
May 21, 2023

Conversation

yuja
Copy link
Contributor

@yuja yuja commented May 21, 2023

#1608

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (src/config-schema.json)
  • I have added tests to cover my changes

Sorry, something went wrong.

yuja added 2 commits May 21, 2023 20:00
Reloading repo also means the working-copy commit can change, so the caller
needs to do more things than repo.reload_at().
Otherwise, working-copy snapshot would be taken against wrong parent, which
would cause divergence if the history was previously rewritten.

Fixes jj-vcs#1608
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good find!

@yuja yuja merged commit c23f1e4 into jj-vcs:main May 21, 2023
@yuja yuja deleted the push-qrultnuuyxrx branch May 21, 2023 23:36
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.

None yet

2 participants