Retain both sets of parity revision notes after the upstream integration. Keep the hierarchical picker and deleted-destination guard unchanged. Co-Authored-By: Codex <noreply@openai.com>