perl5.24 build failing on a new 11.1-STABLE install

[Antoine Brodin]

On Wed, Mar 28, 2018 at 12:42 PM, Michael Grimm <trashcan at ellael.org> wrote:
> Antoine Brodin <antoine at freebsd.org> wrote:
>
>> On Wed, Mar 28, 2018 at 12:04 PM, Michael Grimm <trashcan at ellael.org> wrote:
>
>>> FreeBSD 11.1-STABLE #0 r331660: Wed Mar 28 08:36:15 CEST 2018     root at mer-waases:/usr/obj/usr/src/sys/CUSTOM
>
>> You can try to revert https://svnweb.freebsd.org/changeset/base/331551
>
> Please excuse my ignorance, but I haven't done that before. After a quick scan in svn help I came up with:
>
>         svn merge -r 331660:331551
>
> Is this correct?
> What I want to achieve is keeping all commits besides 331551

svn merge -c -331551 .

Antoine