PKGREVISION conflict between HEAD and stable

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

Hello,
I've commited security patches for Xen packages, and bumped PKGREVISION.
Now I'd like to get these fixes in the stable branch.
The problem: xentools415 also got a PKGREVISION bump for a dependancy change.

At this time, HEAD is at xentools415-4.15.5nb2, -stable is at
xentools415-4.15.5. If I request pullup,
-stable will either get xentools415-4.15.5nb1 or xentools415-4.15.5nb2.
If we go with xentools415-4.15.5nb1, then we have two different
xentools415-4.15.5nb1 packages, one with the security fix and one without.
If we go with xentools415-4.15.5nb2, then we have two different packages
(different dependancies) with the same name, which may bread 2023Q3->2023Q4
upgrades.

How do we deal with this ?

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--