Resurrecting abandoned commits.

[jacg]

I abandoned some commits: jj abandon xyz::. I created some other commits. Now I want to get back the ones that I abandoned. I've found the relevant operation in the op log, and can see exactly the commits I'm after. How can I unabandon them?

I want to see them as a branch in the current version of my repo, alongside any new commits I've created since abandoning them.

[jennings]

Either of the following should do it:

$ jj new COMMIT_ID

$ jj bookmark set some-name -r COMMIT_ID

[jacg]

That works. Thank you.

If I now abandon the new commit (created using your first suggestion) the previously-abandoned commits remain. That's OK, but I did not have the wherewithal to predict whether this or the alternative (the previously-abandoned commits being abandoned once more) would happen.

How can I augment my mental model of JJ to enable me to make such predictions?

[jennings]

Commits in Jujutsu remain visible until one of the following happens:

• You abandon it explicitly.

• It's rewritten and replaced with a successor by snapshotting, squashing, splitting, rebasing, etc.

• After rebasing, a commit becomes empty and so is automatically abandoned.

• A commit is reachable from a bookmark, then after fetching (or just importing changes from git), it is no longer reachable from any bookmark.

  • This only applies when the bookmark was deleted in git and jj imported that. Using jj bookmark delete does not abandon commits.
  • This rule is because removing the last bookmark in git abandons it there, so jj is trying to replicate that result. For example, if your teammate has pushed a remote bookmark you're not even tracking locally, this rule abandons all the commits if the bookmark gets deleted.

[jacg]

So there is no memory of whether the commit was abandoned in the past, it's all done on the basis of the current and previous state of the repository. If true, that's a pretty solid, general and easy-to-understand concept.