From owner-svn-src-stable@freebsd.org Thu Sep 3 18:59:37 2015 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65F829C9555; Thu, 3 Sep 2015 18:59:37 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ob0-x22c.google.com (mail-ob0-x22c.google.com [IPv6:2607:f8b0:4003:c01::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2DA419; Thu, 3 Sep 2015 18:59:37 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by obqa2 with SMTP id a2so40575726obq.3; Thu, 03 Sep 2015 11:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=1+sWQP9SksRP6JYz1LsGUoXnAhIJ+3vOYeaVl5kzqdQ=; b=GBe7j94LhgTl2x1m5dln+R9EfVFAL65YgqDYnfYQkT2ESFtPuikE9m/Coh5P/eF9Bv ueic8PunMZdG0UiUHcUYKf8+V2aDSqrXldHtmAB+QF5y//0ddTOU1JBlp7D1nvkvofIO TbHP8HmbNIMm6MLCrfc/HOFe+66/6KzlMSiIpKoV/yxrV4i5J3VfrseH+La+miyifVuh EU28+RGICDTYzKd5Wgtc8pqnZXVg6csTO4dhE4Vs1MAN9x9/nqn7Si+wRMQQw30zhs0A nUDHlC2b9W8jFa96JYY53ZKB/ZJSm6XWTZFi0/5Htd9eYkkOk2tKe37GldruUbmSUtOW 0U/w== MIME-Version: 1.0 X-Received: by 10.182.96.100 with SMTP id dr4mr14491993obb.49.1441306776330; Thu, 03 Sep 2015 11:59:36 -0700 (PDT) Sender: asomers@gmail.com Received: by 10.202.79.140 with HTTP; Thu, 3 Sep 2015 11:59:36 -0700 (PDT) In-Reply-To: <201509020545.t825jmpT022570@repo.freebsd.org> References: <201509020545.t825jmpT022570@repo.freebsd.org> Date: Thu, 3 Sep 2015 12:59:36 -0600 X-Google-Sender-Auth: UTnswRGPgWWHxLdwXknGR4Adoqc Message-ID: Subject: Re: svn commit: r287392 - in stable/10: etc/mtree usr.bin usr.bin/timeout usr.bin/timeout/tests From: Alan Somers To: Baptiste Daroussin Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2015 18:59:37 -0000 On Tue, Sep 1, 2015 at 11:45 PM, Baptiste Daroussin 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 > .. >