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...

[Pawel Jakub Dawidek]

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" 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." ?

The same for r213738 and for r213817.

-- 
Pawel Jakub Dawidek                       http://www.wheelsystems.com
pjd at FreeBSD.org                           http://www.FreeBSD.org
FreeBSD committer                         Am I Evil? Yes, I Am!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20101026/f7cb5bd4/attachment.pgp