jj log showing merged revisions despite untracking bookmarks

[cdavietei]

I've been using jj for my job for the past couple weeks and love it!

tl;dr: Branches and commits in a repo that I made in git before switching to jj won't go away, despite merging.

Now I've run into an adoption roadblock/skill issue with jj log. I've included a redacted version of my jj log output. I had a bunch of git branches and PRs that I had merged prior to really using jj, however they still persist in the log. (See the big red lines). They previously had bookmarks associated with them, but since they were merged, I manually deleted them with jj bookmark delete.

But the revisions are still there! No matter how many jj git fetch commands I do, the output stays the same. Obviously it's a bit hard to see with redactions, but in general how can I get jj to accept that these revisions are irrelevant and don't need to be tracked anymore?

Should I just delete and reclone the repo?

Thanks in advance!

[jennings]

In git, when a branch is deleted, the commits reachable only from that branch become unreachable and aren't visible even with git log --all.

Jujutsu doesn't work that way, revisions can stay visible even without a bookmark. There are two ways relevant to this discussion that revisions become hidden:

• Run jj abandon
• After importing changes from Git, revisions that were previously reachable from bookmarks but no longer are become hidden.

The second rule keeps jj's view of the repo in sync with git: If commits become unreachable on the remote because the branch was deleted, you probably want them gone locally as well.

But, you can see the commits in the branch ending in tqsztpyo no longer have any bookmarks on them. You can explicitly abandon those at once using a revset. Some options are:

• jj abandon bookmarks()..tqsztp will abandon everything reachable from tqsztp that isn't reachable from any bookmark.
• jj abandon xu::tqs will abandon everything from xu through tqs, you might feel better explicitly specifying the endpoints like this.

[cdavietei]

Thanks for the explanation!

I tried running jj abandon bookmarks()..tqsztp and the command itself succeeded but now any jj command gives the below error

jj:120: command not found: ..tqsztp

With the number after jj: increasing with any command I run, even jj undo

Will investigate a bit but mentioning incase you've seen this before.

[cdavietei]

Opening a new terminal session fixed the issue

[jennings]

I've seen that, I think the parentheses in the command defined a function in your shell. To avoid this, surround it in quotes:

$ jj abandon 'bookmarks()..tqsztp'