Date: Thu, 3 Sep 2015 12:59:36 -0600 From: Alan Somers <asomers@freebsd.org> To: Baptiste Daroussin <bapt@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r287392 - in stable/10: etc/mtree usr.bin usr.bin/timeout usr.bin/timeout/tests Message-ID: <CAOtMX2iCLtiVJDBTpN43=2%2Bjkce-mYSbbQbw3zqN2e%2BNh=S_dA@mail.gmail.com> In-Reply-To: <201509020545.t825jmpT022570@repo.freebsd.org> References: <201509020545.t825jmpT022570@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Sep 1, 2015 at 11:45 PM, Baptiste Daroussin <bapt@freebsd.org> wrote: > Author: bapt > Date: Wed Sep 2 05:45:47 2015 > New Revision: 287392 > URL: https://svnweb.freebsd.org/changeset/base/287392 > > Log: > MFC: r268745,r268746,r268747,r268748,r268749,r268861,r268750,r268751,r268763 > r273769,r273771,r276771,r278810 > > New BSDL timeout(1) utility compatible with GNU timeout > > Relnotes: yes > > Added: > stable/10/usr.bin/timeout/ > - copied from r268745, head/usr.bin/timeout/ > stable/10/usr.bin/timeout/tests/ > - copied from r273771, head/usr.bin/timeout/tests/ > Modified: > stable/10/etc/mtree/BSD.tests.dist > stable/10/usr.bin/Makefile > stable/10/usr.bin/timeout/Makefile > stable/10/usr.bin/timeout/timeout.1 > stable/10/usr.bin/timeout/timeout.c > Directory Properties: > stable/10/ (props changed) > It looks like you mismerged etc/mtree/BSD.tests.dist. Instead of creating "/usr/tests/usr.bin/timeout", you created "/usr/tests/usr.sbin/bmake/timeout". > Modified: stable/10/etc/mtree/BSD.tests.dist > ============================================================================== > --- stable/10/etc/mtree/BSD.tests.dist Wed Sep 2 02:50:41 2015 (r287391) > +++ stable/10/etc/mtree/BSD.tests.dist Wed Sep 2 05:45:47 2015 (r287392) > @@ -323,6 +323,8 @@ > .. > .. > .. > + timeout > + .. > variables > modifier_M > .. >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOtMX2iCLtiVJDBTpN43=2%2Bjkce-mYSbbQbw3zqN2e%2BNh=S_dA>