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

docs: Rework bookmarks.md #4495

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

docs: Rework bookmarks.md #4495

wants to merge 1 commit into from

Conversation

PhilipMetzger
Copy link
Collaborator

@PhilipMetzger PhilipMetzger commented Sep 17, 2024

This applies some suggestions from Ilya from #4341 and starts to differentiate in terminology.

cc @ilyagr for edits.

Checklist

If applicable:

  • I have updated the documentation (README.md, docs/, demos/)

Currently Jujutsu maps its Bookmarks to Git Branches and stores them as that
in the Git backend. This means that all Bookmarks will be reflected as
In a Jujutsu repo that's colocated with Git, Jujutsu's bookmarks map to Git
branches. This means that all Bookmarks will be reflected as
Copy link
Collaborator

Choose a reason for hiding this comment

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

I thought that it was true as soon as git is used as a backend, even in non-colocated repositories. Am I wrong?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

its based on this comment #4341 (comment).

Copy link
Owner

Choose a reason for hiding this comment

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

I thought that it was true as soon as git is used as a backend, even in non-colocated repositories. Am I wrong?

You're right. Well, it was more correct before than after at least, but the old form also sounds a bit incorrect to me. I think "stores them as that in the Git backend" makes it sound like we actually store bookmarks as branches in the Git backend. We store bookmarks in the operation store (which has no Git backend). We have jj git export/import to export/import from/to our operation store to Git. The export/import requires a Git backend, but it is not the source of truth for storage of bookmarks.

This applies some suggestions from Ilya from #4341 and starts to differentiate in terminology.
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.

3 participants