An interesting trick is to develop a fix as a feature branch based as far back as practicable, and then merge it into the trunk and any release branches.