Equivalent to "git revert -m 1"?

[steinuil]

Let's say I have this merged branch in my log:

◆    yrlznwym [email protected] 2025-06-23 09:30:50 main git_head() 857cbf92
├─╮  (empty) Merge branch 'inject-rabbit-url-metatron' into 'main'
│ ◆  uxztvukt [email protected] 2025-06-23 09:29:20 d06ef320
│ │  change version to 2025.6.1
│ ◆  kmykotqw [email protected] 2025-06-20 10:42:36 2a57e426
│ │  remove unnecessary edit
│ ◆  klmrpvrn [email protected] 2025-06-20 10:29:12 ea68f474
├─╯  Use Rabbit URL for Metatron deployments; fix pipeline list sorting bug
◆  uomrwxqm [email protected] 2025-06-05 11:30:04 40f973be
│  feat: close command
~

I need to revert the inject-rabbit-url-metatron branch. With git I can use git revert --mainline 1 857cbf92, which produces a single revert commit that will revert the revset klmr::yrlz.

I'm not sure how to do that in jj so I want to ask:

1. How do I express the revset from the commit after the "fork point" of the inject-rabbit-url-metatron branch up to its merge commit?
2. How do I revert this revset so that it produces a single revert commit instead of one for each commit?

[emilazy]

I think you want to just jj new main && jj restore --from uom. Since Jujutsu treats the contents of merge commits as being only the changes they make on top of the merge result (including conflict resolution), I think you can’t express this as a revert of any one commit. I suppose the alternative would be to jj revert -r klm::uxz -d main and then squash them.

[steinuil]

Fair enough, I was just wondering if I was missing anything. I didn't think about using jj restore though, I'll give it a try. Thank you!

[joyously]

Do you actually need a revert, or can you abandon or undo?

[steinuil]

In this case it has to be a non-destructive change because the main branch is protected and I can't force push to it.