Date: Wed, 28 Mar 2018 07:57:02 -0500 From: Bob Willcox <bob@immure.com> To: Antoine Brodin <antoine@freebsd.org> Cc: Michael Grimm <trashcan@ellael.org>, Mark Johnston <markj@freebsd.org>, ports list <freebsd-ports@freebsd.org> Subject: Re: perl5.24 build failing on a new 11.1-STABLE install Message-ID: <20180328125702.GH56808@rancor.immure.com> In-Reply-To: <CAALwa8nP5RT56JuEuouYDKPv8u8BNF6mtYEHQxHOSf%2B756b--w@mail.gmail.com> 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> <CAALwa8nP5RT56JuEuouYDKPv8u8BNF6mtYEHQxHOSf%2B756b--w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Mar 28, 2018 at 12:45:27PM +0000, Antoine Brodin wrote: > 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 Thanks Antoine, I've done the above svn command and am now rebuilding world on my system. Should be able to give it a try this evening when I get home. Bob -- Bob Willcox | The amount of flak received on any subject is inversely bob@immure.com | proportional to the subject's true value. Austin, TX |
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180328125702.GH56808>