Date: Wed, 27 Oct 2010 00:07:42 +0200 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: Colin Percival <cperciva@freebsd.org> 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" <obrien@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... Message-ID: <20101026220742.GB1848@garage.freebsd.pl> In-Reply-To: <4CC4BFC8.4010500@freebsd.org> References: <201010242309.o9ON90uV043782@svn.freebsd.org> <4CC4BFC8.4010500@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101026220742.GB1848>