You wouldn't even need to relax requirement 2 too much, rebasing your commented ...

striking 4 months ago | parent | context | favorite | on: Ask HN: How do you maintain personal annotations f...

You wouldn't even need to relax requirement 2 too much, rebasing your commented fork on the trunk would actually help you keep your comments up to date.