From owner-svn-src-stable-7@FreeBSD.ORG Tue Oct 26 22:36:58 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C66D4106566B; Tue, 26 Oct 2010 22:36:58 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id 69A9F8FC15; Tue, 26 Oct 2010 22:36:58 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 3E3BE45D8D; Wed, 27 Oct 2010 00:08:22 +0200 (CEST) Received: from localhost (chello089073192049.chello.pl [89.73.192.49]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id A494E45C9B; Wed, 27 Oct 2010 00:08:16 +0200 (CEST) Date: Wed, 27 Oct 2010 00:07:42 +0200 From: Pawel Jakub Dawidek To: Colin Percival Message-ID: <20101026220742.GB1848@garage.freebsd.pl> References: <201010242309.o9ON90uV043782@svn.freebsd.org> <4CC4BFC8.4010500@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="kORqDWCi7qDJ0mEj" Content-Disposition: inline In-Reply-To: <4CC4BFC8.4010500@freebsd.org> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT amd64 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.6 required=4.5 tests=BAYES_00,RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org, "David E. O'Brien" 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-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2010 22:36:58 -0000 --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 24, 2010 at 04:22:48PM -0700, Colin Percival wrote: > On 10/24/10 16:09, David E. O'Brien wrote: > > MFC r213814: Do not assume in growstackstr() that a "precious" charac= ter > > will be immediately written into the stack after the call. Instead l= et > > the caller manage the "space left". > >=20 > > Added: > > stable/7/tools/regression/bin/sh/expansion/trim4.0 > > - copied unchanged from r213814, head/tools/regression/bin/sh/expa= nsion/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) >=20 > 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." ? The same for r213738 and for r213817. --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --kORqDWCi7qDJ0mEj Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkzHUS4ACgkQForvXbEpPzRLUgCZAWGbFi2pp5Ry0tnQJ6319G8v uCMAoLYZAGSBpXEk6+YzQIpDyNYCg+4G =8pqZ -----END PGP SIGNATURE----- --kORqDWCi7qDJ0mEj--