Queued, many thanks. > + elif stop: > + rbsrt = rebaseruntime(repo, ui) > + rbsrt.restorestatus() Perhaps `restorestatus()` needs to be covered by the lock to prevent it from being updated by another process. Can you send a follow up?