Collaborator loses local revisions after jj git fetch + jj rebase

[jonathanyale]

I’m collaborating on a project using jj with GitHub.

Setup:

• I’m the repo owner.
• I invited my collaborator as a GitHub repo collaborator.
• We both use jj bookmark m master -t @- + jj git push -b master + jj git fetch to sync each other’s changes.
• We are not creating any PR & just using a single bookmark.

Problem:
When my collaborator fetches my revisions, those revisions show up in their jj log, but when they try to create a new revision on top of mine, all of their previous revisions disappear from the log.

Meanwhile, when I fetch their revisions, I don’t see this problem — my log stays complete, and I can rebase/new normally.

Example (from collaborator’s side):

Before fetch:

@  tr  (empty)  userA
|
-  tx  something  userA

After jj git fetch:

@  tr  (empty)  userA
|
|-  m   something else  userB
|
-  tx  something  userA

After jj rebase -A m or jj new m:

@  tr  (empty)  userA
|
-  m   something else  userB

At this point, the tx something userA revision is gone.

Question:

• How should we configure or adjust our workflow so both collaborators can rebase without losing local history?

[jennings]

The default log revset only shows the first immutable commit so you have a little context. The assumption is that you aren't working on immutable commits, so seeing their full history is a distraction.

• They originally saw tx because it was the immutable commit their change tr was based on.
• After rebasing, tr is based on m, so tx is no longer visible.

If you specify a revset, you will see it: jj log -r '::master' -n 10, for example, will show the last 10 commits in the master branch.

If you really want to change this behavior, you can change the default log revset. But, I recommend using the default for a while to see if you like it.

FAQ entry: Where is my commit, why is it not visible in jj log?

Side note, you probably want to use jj rebase -d m, not jj rebase -A m. The -d m option rebases the commits on top of m, but -A m inserts commits between m and its children. If m has no other children, these are the same, but otherwise -A m can easily do something you don't intend.

[jonathanyale]

Thanks, that explains my question very well.