Re: Plist conflicts between branches

2020-06-25 Thread Stuart Henderson
On 2020/06/25 21:56, Christian Weisgerber wrote: > The way we merge back security changes to -stable creates the > situation where we have packages with the same name, but different > contents, e.g. pcre2-10.34 in OPENBSD_6_7 and pcre2-10.34 in > OPENBSD_6_6. > > This causes PLIST conflicts when b

Plist conflicts between branches

2020-06-25 Thread Christian Weisgerber
The way we merge back security changes to -stable creates the situation where we have packages with the same name, but different contents, e.g. pcre2-10.34 in OPENBSD_6_7 and pcre2-10.34 in OPENBSD_6_6. This causes PLIST conflicts when building such packages. I just tried to build a bunch of port