For the record: The change I suggested at the end of the long comment, namely
> This is a very roundabout way to adapt pending. It would be simpler to just
> commute pending through the effect of the removed patches and directly store
> the result.
has been made as part of the following two patches (both in screened):
* rebase: offer to revert conflicting unrecorded changes
* obliterate: offer to revert conflicting unrecorded changes (if any)
I failed to mention this is in their descriptions (and the tickets) because they
actually pre-date this fix and were rebased afterwards (because I didn't want to
conflate a new feature with a bugfix).
|