Cleaning up superfluous revisions in jj log

[bcspragu]

I've been making contributions to someone else's project. I created a fork of their repo, and I have both of the remotes set in my local repo.

My problem is that, after a few (~4) contributions, my jj log looks like chaos:

Raw text representation of `jj log`

[N] bsprague@bsprague ~/P/e/r/rapidriteros> jj log
@  npxvvwyo brandon@sprague.mx 2024-11-24 18:03:07 e532132d
│  (empty) (no description set)
│ ○  yqpoukqo brandon@sprague.mx 2024-11-24 18:03:00 ba8d9abf
├─╯  Tweaks to worker for debugging
◆  uswyzrsk lepetitg@gmail.com 2024-11-24 17:50:18 main main@upstream 7729d0a2
│  fix bug with keep alive events incorrectly being processed as events
~  (elided revisions)
│ ○  ynrswtzq?? lepetitg@gmail.com 2024-11-24 17:24:16 02f06b56
│ │  fixes
│ ○  vupxyzzy?? lepetitg@gmail.com 2024-11-24 17:24:16 40e06313
│ │  set immediate show in a better way
│ ○  sttnuwsu?? lepetitg@gmail.com 2024-11-24 17:24:16 96140c0d
│ │  async django
│ ○  ttvolmok?? lepetitg@gmail.com 2024-11-24 17:24:16 21ebbd22
│ │  tiny fixes, try to get p5 to work again
│ ○    qmttxwsr?? lepetitg@gmail.com 2024-11-24 17:24:16 0cfe30cd
│ ├─╮  (empty) Merge branch 'main' of github.com:gregsadetsky/rapidriteros
│ │ ○  wowyokks?? lepetitg@gmail.com 2024-11-24 17:24:16 237ab2d7
│ ╭─┤  (empty) Merge pull request #12 from bcspragu/main
│ │ ○  snkvzovv?? brandon@sprague.mx 2024-11-24 17:24:16 8d7e4da3
│ ├─╯  The WASM must F L O W
│ ○  wtuvpqsk?? lepetitg@gmail.com 2024-11-24 17:24:16 6e868ada
│ │  update to wasm, gitignore
│ ○    qkrozskl?? lepetitg@gmail.com 2024-11-24 17:24:16 3e657048
│ ├─╮  (empty) Merge branch 'main' of github.com:gregsadetsky/rapidriteros
│ │ ○    ypnyusnu?? lepetitg@gmail.com 2024-11-24 17:24:16 12c97897
╭───┼─╮  (empty) Merge pull request #7 from bcspragu/brandon/wasm-renderer
│ │ │ ○  muskwlyn?? brandon@sprague.mx 2024-11-24 17:24:16 bdc59402
│ │ │ │  Don't use MUSL
│ │ │ ○  xpmosotu?? brandon@sprague.mx 2024-11-24 17:24:16 78d40972
╭───┬─╯  [WIP! DRAFT! Hideous!] Add WASM renderer
│ ○ │  ulvmyuox?? lepetitg@gmail.com 2024-11-24 17:24:16 33a56dcb
╭─┼─╮  (empty) Merge branch 'main' of github.com:gregsadetsky/rapidriteros
◆ │ │  msrtwuxr brandon@sprague.mx 2024-11-08 17:13:56 d281512f
├───╯  Add support for **immediately** rendering a given show
◆ │  vmmztlqu jesse.z.chen@gmail.com 2024-11-07 12:04:09 ce53f4ac
│ │  (empty) Merge pull request #6 from jessechen/working
~ │  (elided revisions)
├─╯
◆  srvqrslx lepetitg@gmail.com 2024-09-02 12:30:50 0427dee6
│  .
~

What are all those conflicted commits and how are they empty?? And what's the "correct" way to clean them. I can see they show up as part of immutable_heads().., and ancestors(immutable_heads().., 2) is part of the default log revset.

The way I've been contributing is something like:

1. Do some work
2. Make a bookmark (or use main)
3. Push that to my fork
4. Create a PR, either in the GH UI or via gh
5. Upstream merges them in

Some debugging info:

> jj bookmark list --tracked
main: uswyzrsk 7729d0a2 fix bug with keep alive events incorrectly being processed as events
  @origin: uswyzrsk 7729d0a2 fix bug with keep alive events incorrectly being processed as events

> jj git remote list
origin git@github.com:bcspragu/rapidriteros.git
upstream git@github.com:gregsadetsky/rapidriteros.git

My entire `jj op log`

@  5e13d5f6a4cf bsprague@bsprague 14 minutes ago, lasted 1 second
│  push bookmark main to git remote origin
│  args: jj git push --remote origin
○  9977065d0be4 bsprague@bsprague 14 minutes ago, lasted 1 millisecond
│  point bookmark main to commit 7729d0a2eddf36990b6e518a875437effe108cea
│  args: jj bookmark move main --to us
○  d42a1cae6a52 bsprague@bsprague 17 minutes ago, lasted 9 milliseconds
│  new empty commit
│  args: jj new us
○  8c66f8f8892d bsprague@bsprague 17 minutes ago, lasted 12 milliseconds
│  rebase commit b422b86329c8fb0a10d6f4d4e35e08ef863a37f5 and descendants
│  args: jj rebase -s yq -d us
○  7a7c92395c9c bsprague@bsprague 24 minutes ago, lasted 1 second
│  fetch from git remote(s) upstream
│  args: jj git fetch --remote upstream
○  80cc1e6b14dc bsprague@bsprague 37 minutes ago, lasted less than a microsecond
│  forget bookmark immediately_show_show
│  args: jj bookmark forget immediately_show_show
○  328d6fbf0f9d bsprague@bsprague 39 minutes ago, lasted 1 second
│  push bookmark main to git remote origin
│  args: jj git push --remote origin
○  918be6480f53 bsprague@bsprague 40 minutes ago, lasted 11 milliseconds
│  rebase commit 0f2755fa7a09fa119bb710e85ebf63be946459da and descendants
│  args: jj rebase -s x -d 837
○  1b9151a35ee6 bsprague@bsprague 41 minutes ago, lasted 12 milliseconds
│  abandon commit 9d00de39dc6bbde868c8383252c6caf8b8b4bcac and 1 more
│  args: jj abandon -r str --ignore-immutable
○  8913dc91b4dd bsprague@bsprague 42 minutes ago, lasted 1 second
│  fetch from git remote(s) upstream
│  args: jj git fetch --remote upstream
○  0389ad630911 bsprague@bsprague 43 minutes ago, lasted 2 milliseconds
│  remove git remote upstream
│  args: jj git remote remove upstream
○  4551cba5f47a bsprague@bsprague 43 minutes ago, lasted 1 second
│  push bookmark brandon/wasm-renderer to git remote origin
│  args: jj git push --bookmark brandon/wasm-renderer
○  e427d58b422d bsprague@bsprague 44 minutes ago, lasted less than a microsecond
│  track remote bookmark main@origin
│  args: jj bookmark track main@origin
○  61ae388c4aee bsprague@bsprague 47 minutes ago, lasted 1 millisecond
│  point bookmark main to commit 097ed56baa796c249015aa44938b5fed67556e0a
│  args: jj bookmark set main -r x
○  05c3e0ec189a bsprague@bsprague 48 minutes ago, lasted less than a microsecond
│  track remote bookmark main@upstream
│  args: jj bookmark track main@upstream
○  d9f25636c2c0 bsprague@bsprague 49 minutes ago, lasted less than a microsecond
│  untrack remote bookmark main@upstream
│  args: jj bookmark untrack main@upstream
○  f30f8e7a2297 bsprague@bsprague 49 minutes ago, lasted 1 millisecond
│  untrack remote bookmark main@origin
│  args: jj bookmark untrack main@origin
○  814b4df919c3 bsprague@bsprague 54 minutes ago, lasted 1 second
│  push bookmark main to git remote origin
│  args: jj git push
○  e5ad2c52eb7f bsprague@bsprague 55 minutes ago, lasted less than a microsecond
│  untrack remote bookmark immediately_show_show@origin
│  args: jj bookmark untrack immediately_show_show@origin
○  fa2e2077bff1 bsprague@bsprague 55 minutes ago, lasted 26 milliseconds
│  abandon commit 8f8dd31607050609374566d2e69a4d4235c4870a and 1 more
│  args: jj abandon zprssroy --ignore-immutable
○  f041a5fa9d22 bsprague@bsprague 56 minutes ago, lasted 1 second
│  push bookmark main to git remote origin
│  args: jj git push
○  47cab16936db bsprague@bsprague 56 minutes ago, lasted 1 millisecond
│  point bookmark main to commit 3cd5fac8e074b9c5d9c24df45fb510fc7b0b8ec1
│  args: jj bookmark move main
○  aa7b45220c9a bsprague@bsprague 56 minutes ago, lasted 17 seconds
│  describe commit 94cd934acbf72f11bc2f9a5930ad9ef540a8a9de
│  args: jj describe
○  cc35b96e1e30 bsprague@bsprague 57 minutes ago, lasted 11 milliseconds
│  snapshot working copy
│  args: jj st
○  21916c3cd217 bsprague@bsprague 57 minutes ago, lasted less than a microsecond
│  edit commit 60399eea8b2408bd60e1cc27ae3ca2d891148589
│  args: jj edit x
○  cbf6351d5c79 bsprague@bsprague 1 hour ago, lasted 3 minutes
│  split commit c35ddb6f4c54d8dbb30719fa4b1b49754fb3042d
│  args: jj split
○  03352559e686 bsprague@bsprague 1 hour ago, lasted 9 milliseconds
│  snapshot working copy
│  args: jj log
○  a8ab1c07b188 bsprague@bsprague 1 hour ago, lasted 9 milliseconds
│  snapshot working copy
│  args: jj log
○  855fcd8a986f bsprague@bsprague 1 hour ago, lasted 18 milliseconds
│  rebase commit 1e243cb98e33d864e8f116a8984599fe24fc7c4b and descendants
│  args: jj rebase -d str
○  0b383843fb3f bsprague@bsprague 1 hour ago, lasted 1 second
│  fetch from git remote(s) upstream
│  args: jj git fetch --remote upstream
○  91dcdd395ae8 bsprague@bsprague 1 hour ago, lasted 12 milliseconds
│  describe commit 01867339d430d9a166be28d31bc7a910ffe6da46
│  args: jj describe -m 'assorted attempts to fix wasm stutter'
○  2a24572da2fe bsprague@bsprague 1 hour ago, lasted 12 milliseconds
│  snapshot working copy
│  args: jj st
○  baba2ba260ca bsprague@bsprague 4 hours ago, lasted 16 milliseconds
│  new empty commit
│  args: jj new wo
○  930260ff7c99 bsprague@bsprague 4 hours ago, lasted 1 second
│  fetch from git remote(s) upstream
│  args: jj git fetch --remote upstream
○  89a30955e36b bsprague@bsprague 3 days ago, lasted 1 second
│  push bookmark main to git remote origin
│  args: jj git push --remote origin
○  89fd268b3b5d bsprague@bsprague 3 days ago, lasted 1 millisecond
│  point bookmark main to commit b1bb346932e844cdb809389399c2856e8fc9ca69
│  args: jj bookmark move main
○  54c296f4a21a bsprague@bsprague 3 days ago, lasted 1 millisecond
│  delete bookmark brandon/fix-all-the-things
│  args: jj bookmark delete brandon/fix-all-the-things
○  d01f509e0c2b bsprague@bsprague 3 days ago, lasted less than a microsecond
│  delete bookmark main@origin
│  args: jj bookmark delete main@origin
○  633be57a42f0 bsprague@bsprague 3 days ago, lasted less than a microsecond
│  delete bookmark sn
│  args: jj bookmark delete sn
○  9096d3618d74 bsprague@bsprague 3 days ago, lasted 2 milliseconds
│  point bookmark main@origin, sn to commit b1bb346932e844cdb809389399c2856e8fc9ca69
│  args: jj bookmark set main@origin sn
○  d00eafab4c65 bsprague@bsprague 3 days ago, lasted 1 minute
│  describe commit 020499f9761facdc429f686ec18674b1de8dcc6a
│  args: jj describe
○  3bf0176f36ec bsprague@bsprague 3 days ago, lasted 1 millisecond
│  create bookmark brandon/fix-all-the-things pointing to commit 020499f9761facdc429f686ec18674b1de8dcc6a
│  args: jj bookmark create brandon/fix-all-the-things
○  6dda89f17a9e bsprague@bsprague 3 days ago, lasted 16 milliseconds
│  snapshot working copy
│  args: jj diff
○  35d94fe2db11 bsprague@bsprague 3 days ago, lasted 15 milliseconds
│  snapshot working copy
│  args: jj diff
○  37cd25c03fd1 bsprague@bsprague 3 days ago, lasted 17 milliseconds
│  restore into commit 5f365b7253f8ad76a0b5285ae0530bb472e5f9a5
│  args: jj restore renderers/wasm/Dockerfile
○  e953543dcbc5 bsprague@bsprague 3 days ago, lasted 17 milliseconds
│  snapshot working copy
│  args: jj log
○  3d47c9c12a48 bsprague@bsprague 3 days ago, lasted 16 milliseconds
│  describe commit 6879072b845d69e874d6c6f7bdeb759a60ab1476
│  args: jj describe -m 'The WASM must F L O W'
○  7e4da2f6e7b6 bsprague@bsprague 3 days ago, lasted 16 milliseconds
│  new empty commit
│  args: jj new w
○  803a5cab9f69 bsprague@bsprague 3 days ago, lasted 1 millisecond
│  delete bookmark brandon/wasm-renderer
│  args: jj bookmark delete brandon/wasm-renderer
○  c9405941cb4d bsprague@bsprague 3 days ago, lasted 1 second
│  fetch from git remote(s) upstream
│  args: jj git fetch --remote upstream
○  965b51297b34 bsprague@bsprague 1 week ago, lasted 1 second
│  push bookmark brandon/wasm-renderer to git remote origin
│  args: jj git push
○  d732e7b6bf45 bsprague@bsprague 1 week ago, lasted less than a microsecond
│  point bookmark brandon/wasm-renderer to commit 8c089aefef3f5102c4eb95ec91051bdcf3882c77
│  args: jj bookmark move brandon/wasm-renderer
○  987916d5e0ce bsprague@bsprague 1 week ago, lasted 30 seconds
│  describe commit a90a172439f2e6a28efe7316e1a8f401ea53dc14
│  args: jj describe
○  2f3b84d05599 bsprague@bsprague 1 week ago, lasted 128 milliseconds
│  snapshot working copy
│  args: jj st
○  259b702a10dd bsprague@bsprague 1 week ago, lasted 9 milliseconds
│  new empty commit
│  args: jj new
○  5ec9bfa3f59d bsprague@bsprague 1 week ago, lasted 135 milliseconds
│  snapshot working copy
│  args: jj diff
○  a68c868a07dc bsprague@bsprague 1 week ago, lasted 166 milliseconds
│  rebase commit 2d950314926e634c8ddca7863a3b00612b460e9e and descendants
│  args: jj rebase -s x -d main@upstream
○  486771dd5f65 bsprague@bsprague 1 week ago, lasted 1 second
│  push bookmark brandon/wasm-renderer to git remote origin
│  args: jj git push
○  52173bb5480a bsprague@bsprague 1 week ago, lasted 9 milliseconds
│  snapshot working copy
│  args: jj log
○  d28f7e6b6929 bsprague@bsprague 1 week ago, lasted less than a microsecond
│  delete bookmark main
│  args: jj bookmark delete main
○  f49f87b4c9d7 bsprague@bsprague 1 week ago, lasted 1 second
│  push bookmarks brandon/wasm-renderer, main to git remote origin
│  args: jj git push
○  e8084ce1aaec bsprague@bsprague 1 week ago, lasted 21 milliseconds
│  abandon commit d281512fc73c35cb9fd29ff23610e8ca6701a756
│  args: jj abandon m
○  a2d9c986bd3b bsprague@bsprague 1 week ago, lasted 10 milliseconds
│  rebase commit 382e15b8c7674d8c3226b6f4ca3299ed54407fcb and descendants
│  args: jj rebase -s x -d z
○  21e320826b67 bsprague@bsprague 1 week ago, lasted less than a microsecond
│  track remote bookmark main@upstream
│  args: jj bookmark track main@upstream
○  108be1e4ed0a bsprague@bsprague 1 week ago, lasted 1 second
│  fetch from git remote(s) upstream
│  args: jj git fetch --remote upstream
○  1c43f2ee6c50 bsprague@bsprague 1 week ago, lasted 1 second
│  push bookmark brandon/wasm-renderer to git remote origin
│  args: jj git push
○  f8b7fcd2854d bsprague@bsprague 1 week ago, lasted 9 milliseconds
│  snapshot working copy
│  args: jj diff
○  01cfe2430d2d bsprague@bsprague 1 week ago, lasted 9 milliseconds
│  snapshot working copy
│  args: jj diff
○  f6ff7572e912 bsprague@bsprague 1 week ago, lasted 122 milliseconds
│  snapshot working copy
│  args: jj st
○  e79f15adbf78 bsprague@bsprague 1 week ago, lasted 13 milliseconds
│  restore into commit fd8d20d14b23e5fec3815863ee5c8741b43b4d80
│  args: jj restore web/bin/serve.sh
○  b210c78ea7e0 bsprague@bsprague 1 week ago, lasted 2 milliseconds
│  restore into commit dc70b1f415592577c00c8de4254353c7d2366e45
│  args: jj restore renderers/text/text.py
○  d2d0389a7832 bsprague@bsprague 1 week ago, lasted 10 milliseconds
│  snapshot working copy
│  args: jj restore renderers/text/text.py
○  dedaf65f79e0 bsprague@bsprague 1 week ago, lasted 136 milliseconds
│  snapshot working copy
│  args: jj log
○  e15b85762b6d bsprague@bsprague 1 week ago, lasted less than a microsecond
│  point bookmark brandon/wasm-renderer to commit c51524e008c246a246d666f027122fe47e7f5f89
│  args: jj bookmark move brandon/wasm-renderer
○  f3d76418f513 bsprague@bsprague 1 week ago, lasted less than a microsecond
│  delete bookmark immediately_show_show
│  args: jj bookmark delete immediately_show_show
○  e14caba6df05 bsprague@bsprague 1 week ago, lasted 10 milliseconds
│  snapshot working copy
│  args: jj log
○  dec8e18ca95c bsprague@bsprague 2 weeks ago, lasted 19 milliseconds
│  squash commits into c1e873d379622ee6f7a5d21c9cc5f1d2450a3e2e
│  args: jj squash --from vy
○  bd9eb2d7faf5 bsprague@bsprague 2 weeks ago, lasted 10 milliseconds
│  new empty commit
│  args: jj new m
○  e213b3e8c6b7 bsprague@bsprague 2 weeks ago, lasted 1 second
│  push bookmark immediately_show_show to git remote origin
│  args: jj git push
○  2ba15887155a bsprague@bsprague 2 weeks ago, lasted less than a microsecond
│  create bookmark immediately_show_show pointing to commit d281512fc73c35cb9fd29ff23610e8ca6701a756
│  args: jj bookmark create immediately_show_show
○  b566a896daf5 bsprague@bsprague 2 weeks ago, lasted 1 minute
│  describe commit 431310c83ca62d3cf6e9e41fee73d0539935b3ca
│  args: jj describe
○  855b89bfd676 bsprague@bsprague 2 weeks ago, lasted 9 milliseconds
│  snapshot working copy
│  args: jj log
○  cb2fbb0151e9 bsprague@bsprague 2 weeks ago, lasted 10 milliseconds
│  snapshot working copy
│  args: jj diff
○  3d13a7b2d5d1 bsprague@bsprague 2 weeks ago, lasted 17 milliseconds
│  snapshot working copy
│  args: jj diff
○  31afbac081fe bsprague@bsprague 2 weeks ago, lasted 9 milliseconds
│  new empty commit
│  args: jj new vm
○  4b3acc4a0dc4 bsprague@bsprague 2 weeks ago, lasted 820 milliseconds
│  fetch from git remote(s) origin
│  args: jj git fetch
○  ee8d085496bf bsprague@bsprague 2 weeks ago, lasted 10 milliseconds
│  new empty commit
│  args: jj new n
○  3f0c9064ae71 bsprague@bsprague 2 weeks ago, lasted 137 milliseconds
│  snapshot working copy
│  args: jj log
○  8d6f6185bab1 bsprague@bsprague 2 weeks ago, lasted 5 seconds
│  push bookmark brandon/wasm-renderer to git remote origin
│  args: jj git push
○  c3f5d128a73e bsprague@bsprague 2 weeks ago, lasted 43 seconds
│  describe commit 08aa8443a0d5879aacea82be83b2616cc44fd25c
│  args: jj describe
○  4f4ee73218f7 bsprague@bsprague 2 weeks ago, lasted less than a microsecond
│  create bookmark brandon/wasm-renderer pointing to commit 08aa8443a0d5879aacea82be83b2616cc44fd25c
│  args: jj bookmark create brandon/wasm-renderer
○  6555a2dfde14 bsprague@bsprague 2 weeks ago, lasted 10 milliseconds
│  snapshot working copy
│  args: jj st
○  c80b21b1a67c bsprague@bsprague 2 weeks ago, lasted 10 milliseconds
│  restore into commit 5b7ce54b6cd000981cde07029a49e7d23895fe32
│  args: jj restore web/.env.example
○  68c4d7173753 bsprague@bsprague 2 weeks ago, lasted 9 milliseconds
│  snapshot working copy
│  args: jj diff -- web/.env.example
○  c0dc550212a8 bsprague@bsprague 2 weeks ago, lasted 9 milliseconds
│  snapshot working copy
│  args: jj log
○  d33a9beef984 bsprague@bsprague 2 weeks ago, lasted 17 milliseconds
│  restore into commit d3353761b08074fc953dc75ecd3184730edfc5a9
│  args: jj restore web/.env.example
○  8826b3c5e529 bsprague@bsprague 2 weeks ago, lasted 17 milliseconds
│  restore into commit ec9cb98ee3f24679a1851beec0359142b529cee2
│  args: jj restore README.md
○  ce8029274b1c bsprague@bsprague 2 weeks ago, lasted 16 milliseconds
│  snapshot working copy
│  args: jj log
○  7001d545e68a bsprague@bsprague 2 weeks ago, lasted 15 milliseconds
│  snapshot working copy
│  args: jj log
○  c2f281eccbb3 bsprague@bsprague 2 weeks ago, lasted 1 millisecond
│  check out git remote's default branch
│  args: jj git clone git@github.com:gregsadetsky/rapidriteros.git
○  58087dd87119 bsprague@bsprague 2 weeks ago, lasted 1 second
│  fetch from git remote into empty repo
│  args: jj git clone git@github.com:gregsadetsky/rapidriteros.git
○  22ba45eaa648 bsprague@bsprague 2 weeks ago, lasted 18 milliseconds
│  add workspace 'default'
○  c4a0fdfed65d bsprague@bsprague 2 weeks ago, lasted less than a microsecond
│  initialize repo
○  000000000000 root()

Using a default repo config.toml and nothing interesting in my ~/.config/jj/config.toml

[martinvonz]

What are all those conflicted commits and how are they empty??

See https://martinvonz.github.io/jj/latest/FAQ/#how-do-i-deal-with-divergent-changes-after-the-change-id for some explanation of why they might be divergent. I sent PR #4966 to try to explain why merge commits are often empty.

And what's the "correct" way to clean them. I can see they show up as part of immutable_heads().., and ancestors(immutable_heads().., 2) is part of the default log revset.

What happens on the remotes when the PR has been merged? Is the remote configured to delete the branch? If it is, then the next jj git fetch should detect that the branch was deleted, and any commits that are no longer reachable on the remote will be abandoned in your local repo too.

[bcspragu]

Thanks for the explanation and for updating the docs! I was able to abandon those divergent changes with:

jj abandon 02f06b56 40e06313 96140c0d 21ebbd22 0cfe30cd 237ab2d7 8d7e4da3 6e868ada 3e657048 12c97897 bdc59402 78d40972 33a56dcb

And that gives me the jj log output I'm expecting:

> jj log
@  npxvvwyo brandon@sprague.mx 2024-11-24 18:03:07 e532132d
│  (empty) (no description set)
│ ○  yqpoukqo brandon@sprague.mx 2024-11-24 18:03:00 ba8d9abf
├─╯  Tweaks to worker for debugging
◆  uswyzrsk lepetitg@gmail.com 2024-11-24 17:50:18 main main@upstream 7729d0a2
│  fix bug with keep alive events incorrectly being processed as events
~

Just by text-munging the ?? lines. Is there a better way to say "abandon all the divergent changes"? I didn't see any obvious way in the revset language docs.

What happens on the remotes when the PR has been merged? Is the remote configured to delete the branch?

In this case, the PRs had already been merged and jj git fetch reported Nothing changed. Looking at the upstream branches, there was just main. It looks like I did two of my contributions directly from main and two from feature branches, but I was flailing around a bit trying to figure out the correct set of remotes/bookmarks/tracking/etc, so I had deleted at least one of the (already merged) branches in that process.

So the short answer is "no, my origin doesn't automatically delete branches on merge", but I can try that for future ones to see if it automagically resolves things in the future

[martinvonz]

Just by text-munging the ?? lines. Is there a better way to say "abandon all the divergent changes"? I didn't see any obvious way in the revset language docs.

Good question. It looks like we don't have one. I filed #4972 to track it.

Btw, just searching for ?? is of course not safe, especially since we also use ?? to indicate conflicted branches. So avoid using it in scripts.

[magneticflux-]

Like @martinvonz says, THIS IS NOT SAFE!!!

With that out of the way, I had great success cleaning up a hundred divergent changes from uninvolved branches in NixOS/nixpkgs by running this command: jj log --no-graph | grep '??' | awk '{ print $5; };' | xargs jj abandon -r. BUT CHECK FIRST! Skim jj log --no-graph | grep '??' for anything important before pulling the trigger because it'll be a pain to undo a hundred mistakes.