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

[Colin Percival]

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