svn commit: r259326 - stable/10/contrib/tcpdump

[Tijl Coosemans]

On Fri, 13 Dec 2013 15:04:21 -0500 Pedro Giffuni wrote:
> On 13.12.2013 14:43, Eitan Adler wrote:
>> On Fri, Dec 13, 2013 at 2:32 PM, Pedro F. Giffuni <pfg at freebsd.org> wrote:
>>> Author: pfg
>>> Date: Fri Dec 13 19:32:02 2013
>>> New Revision: 259326
>>> URL: http://svnweb.freebsd.org/changeset/base/259326
>>>
>>> Log:
>>>    MFV r258571:
>>>
>>>    Removes strict-aliasing warnings from newer GCC in tcpdump.
>>>
>>>    Corresponds to MFC r258573, but for some reason our new pre-commit hooks
>>>    will not let us merge it from there.
>> How did you attempt to do this merge?  What were the exact commands?
> 
> (Standing on my local stable/10 dir)
> 
> svn merge -c r258573 ^/head .
> 
> Attempt to commit there fired the pre-commit hook.

This also copies the svn:mergeinfo property on head/contrib/tcpdump
to stable/10/contrib/tcpdump, but this property is only allowed on
stable/10 at the moment.  I think you can just delete the property
before committing:

svn propdel svn:mergeinfo contrib/tcpdump