Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Mar 2018 12:45:27 +0000
From:      Antoine Brodin <antoine@freebsd.org>
To:        Michael Grimm <trashcan@ellael.org>
Cc:        ports list <freebsd-ports@freebsd.org>, Mark Johnston <markj@freebsd.org>
Subject:   Re: perl5.24 build failing on a new 11.1-STABLE install
Message-ID:  <CAALwa8nP5RT56JuEuouYDKPv8u8BNF6mtYEHQxHOSf%2B756b--w@mail.gmail.com>
In-Reply-To: <13E37416-E5A5-4A19-BB56-2C13CC217B43@ellael.org>
References:  <20180327200002.GF76012@rancor.immure.com> <98386C91-02F7-4896-B7EF-863A02F41E46@ellael.org> <CAALwa8=GJjZVM7a7NpGxPgTvN23JXJwGgZ3CCrm8DWCAnhqNpw@mail.gmail.com> <13E37416-E5A5-4A19-BB56-2C13CC217B43@ellael.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Mar 28, 2018 at 12:42 PM, Michael Grimm <trashcan@ellael.org> wrote:
> Antoine Brodin <antoine@freebsd.org> wrote:
>
>> On Wed, Mar 28, 2018 at 12:04 PM, Michael Grimm <trashcan@ellael.org> wrote:
>
>>> FreeBSD 11.1-STABLE #0 r331660: Wed Mar 28 08:36:15 CEST 2018     root@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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8nP5RT56JuEuouYDKPv8u8BNF6mtYEHQxHOSf%2B756b--w>