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:
parent
6949dab389
commit
5e0e90d81e
1 changed files with 1 additions and 0 deletions
|
@ -670,6 +670,7 @@ impl MutableRepo {
|
|||
CommitBuilder::for_rewrite_from(settings, self.store(), ¤t_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.
|
||||
|
|
Loading…
Reference in a new issue