Jujutsu / JJ usage?

[rektide]

Hello folks. How are you other jj / jujutsu users doing with Beads? What if any adaption was required? How has it been working?

I'm a bit nervous, because I don't really understand beads's sync much. I feel like Beads sync is going to interact in weird ways. Wanted to open a discussio.

[PrayagS]

+1 for this question. I have never been able to have it sync properly with the upstream branch. This is when not using master as the sync branch.

File changes are all over the place. Being in a detached HEAD confuses beads from what I think. I got to a good place by making jj ignore beads files while auto-snapshotting but the bd sync still never works as expected consistently.

[rkaramc]

Worked this out by trial-and-error...

Create a temporary bookmark with jj, then checkout the commit using git. This will give you an "attached" HEAD.

!!!Remember not to use any jj tools till this is finished!!

Run bd doctor and follow suggestions to get sync working.

Once sync is working, you can jj new and continue.

made it work on a git-colocated jj repo where jj is pushing changes into git. Haven't tried on a non-colocated jj repo.