From owner-svn-src-stable@FreeBSD.ORG Sun Oct 24 23:22:50 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 1A22C1065673 for ; Sun, 24 Oct 2010 23:22:50 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from xps.daemonology.net (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx2.freebsd.org (Postfix) with SMTP id 5F26614F8EB for ; Sun, 24 Oct 2010 23:22:49 +0000 (UTC) Received: (qmail 52418 invoked from network); 24 Oct 2010 23:22:49 -0000 Received: from unknown (HELO xps.daemonology.net) (127.0.0.1) by localhost with SMTP; 24 Oct 2010 23:22:49 -0000 Message-ID: <4CC4BFC8.4010500@freebsd.org> Date: Sun, 24 Oct 2010 16:22:48 -0700 From: Colin Percival User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.11) Gecko/20100803 Thunderbird/3.0.6 MIME-Version: 1.0 To: "David E. O'Brien" References: <201010242309.o9ON90uV043782@svn.freebsd.org> In-Reply-To: <201010242309.o9ON90uV043782@svn.freebsd.org> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r214307 - in stable/7: . bin/sh contrib/wpa_supplicant gnu/usr.bin/groff/tmac share/misc tools/regression/bin/sh/expansion tools/tools/nanobsd usr.sbin usr.sbin/makefs usr.sbin/makefs/f... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 24 Oct 2010 23:22:50 -0000 On 10/24/10 16:09, David E. O'Brien wrote: > MFC r213814: Do not assume in growstackstr() that a "precious" character > will be immediately written into the stack after the call. Instead let > the caller manage the "space left". > > Added: > stable/7/tools/regression/bin/sh/expansion/trim4.0 > - copied unchanged from r213814, head/tools/regression/bin/sh/expansion/trim4.0 > Modified: > stable/7/bin/sh/histedit.c > stable/7/bin/sh/memalloc.c > stable/7/bin/sh/memalloc.h > Directory Properties: > stable/7/ (props changed) > [snip 362 lines of (props changed)] > stable/7/usr.sbin/zic/ (props changed) Did you read the 'Merging with Subversion' instructions http://wiki.freebsd.org/SubversionPrimer/Merging where it says "Because of mergeinfo propagation, it is important to choose the source and target for the merge carefully to minimize property changes on unrelated directories." ? This commit should not have been merged into stable/7. -- Colin Percival Security Officer, FreeBSD | freebsd.org | The power to serve Founder / author, Tarsnap | tarsnap.com | Online backups for the truly paranoid