ok/jj
1
0
Fork 0
forked from mirrors/jj

MutableRepo: record old checkout abandoned if it's empty

Same reasoning as the previous change.

With this change, I believe we now record all rewritten and abandoned
commits correctly. We're now almost ready to switch the CLI away from
using evolution for automatically rebasing commits.
This commit is contained in:
Martin von Zweigbergk 2021-09-29 16:00:54 -07:00
parent 6949dab389
commit 5e0e90d81e

View file

@ -670,6 +670,7 @@ impl MutableRepo {
CommitBuilder::for_rewrite_from(settings, self.store(), &current_checkout)
.set_pruned(true)
.write_to_repo(self);
self.record_abandoned_commit(current_checkout_id);
}
let store = self.store();
// Create a new tree with any conflicts resolved.