From owner-svn-src-all@FreeBSD.ORG Mon Oct 18 15:00:02 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 661D71065674; Mon, 18 Oct 2010 15:00:02 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from gw03.mail.saunalahti.fi (gw03.mail.saunalahti.fi [195.197.172.111]) by mx1.freebsd.org (Postfix) with ESMTP id 11F858FC20; Mon, 18 Oct 2010 15:00:01 +0000 (UTC) Received: from ws64.jh.dy.fi (a91-153-123-205.elisa-laajakaista.fi [91.153.123.205]) by gw03.mail.saunalahti.fi (Postfix) with SMTP id DCBF521661D; Mon, 18 Oct 2010 17:43:54 +0300 (EEST) Date: Mon, 18 Oct 2010 17:43:53 +0300 From: Jaakko Heinonen To: "David E. O'Brien" Message-ID: <20101018144353.GA1381@ws64.jh.dy.fi> References: <201010140121.o9E1Li3e006863@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201010140121.o9E1Li3e006863@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r213817 - in stable/8: . contrib/top etc/periodic/daily gnu/usr.bin lib/libusb release/picobsd/floppy.tree/sbin sbin/geom/class/sched tools/regression/lib/msun tools/regression/usr.bin/... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Oct 2010 15:00:02 -0000 On 2010-10-14, David E. O'Brien wrote: > MFC r212770 & r212832: > + Add the SCRIPT environmental variable to the sub-shell. > + Add the 'command' argument (if supplied on the command line) > to the typescript file. I don't think that this commit placed mergeinfo correctly. The mergeinfo should have been placed to usr.bin/script like r213828 did for stable/7. > Modified: > stable/8/usr.bin/script/script.1 > stable/8/usr.bin/script/script.c > Directory Properties: > stable/8/ (props changed) > stable/8/Makefile (props changed) > stable/8/Makefile.inc1 (props changed) > stable/8/ObsoleteFiles.inc (props changed) . . . > stable/8/usr.sbin/wpa/ (props changed) > stable/8/usr.sbin/ypserv/ (props changed) > stable/8/usr.sbin/zic/ (props changed) -- Jaakko