How is op abandon supposed to be used? Is there a way to recover if it's misued?

[BatmanAoD]

I did a squash and then a push. I then realized that the changes I had squashed were incorrect, and wanted to return to the state from before the squash, without creating bookmark conflicts by undoing the push.

I first tried jj op undo <squash-op>, without realizing that the "targeted" version of undo is revert. The help-string gave the tip a similar subcommand exists: 'abandon', so I thought that abandoning an operation would undo the change created by that operation, the same way that abandoning a commit rebases descendants. However, abandon just reparents descendants, so the file contents were not changed.

After realizing that there's a revert operation I should have used, is there a way I could have "undone" the abandon so that I could revert the operation instead?

(Also, I think it would be helpful if the tip for jj op undo mentioned both jj undo and jj op revert, and if the --help output for jj undo mentioned jj op revert. I also feel like undo and redo are intrinsically "op" operations, so I'm kind of surprised that "undo" isn't jj op undo, with jj undo simply being an alias, and similarly for redo.)

[jennings]

Disregard this answer, I misread the title and thought we were discussing jj abandon, not jj op abandon.

---

Commits are unhidden (unabandoned) when:

• A new commit appears with the hidden commit as an ancestor
• A bookmark or tag is added to the hidden commit or one of its descendants
• The hidden commit becomes the working copy by running jj edit

If you use the op log to find the commit ID you want to be visible again, you can run jj new <ID> to unhide it.

---

I probably would have used jj undo, then jj git fetch, and just dealt with the conflicted bookmark if it appears. It seems easier to me, but either option would work.

---

jj revert is more like git revert: It creates a commit with the opposite diff from the one you specify. If the original commit is hidden, it doesn't unhide it (unless you create the new commit as its descendant).

[BatmanAoD]

I didn't abandon a commit, I abandoned an operation.

[jennings]

Oh man, I completely misread the title. So sorry!