From owner-svn-src-stable@FreeBSD.ORG  Fri Dec 13 21:32:54 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BF5B715C;
 Fri, 13 Dec 2013 21:32:54 +0000 (UTC)
Received: from mailrelay005.isp.belgacom.be (mailrelay005.isp.belgacom.be
 [195.238.6.171])
 by mx1.freebsd.org (Postfix) with ESMTP id 8EF971FD0;
 Fri, 13 Dec 2013 21:32:53 +0000 (UTC)
X-Belgacom-Dynamic: yes
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AmoGAKJ7q1JbsVZ9/2dsb2JhbABZgwo4SbhsgSQXdIIlAQEFOhwjEAsOBgQJJQ8qHgYTiAgBCMp8F48VB4Q2BJgVgTGQZIMrOw
Received: from 125.86-177-91.adsl-dyn.isp.belgacom.be (HELO
 kalimero.tijl.coosemans.org) ([91.177.86.125])
 by relay.skynet.be with ESMTP; 13 Dec 2013 22:32:46 +0100
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org
 [127.0.0.1])
 by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id rBDLWj0x013693;
 Fri, 13 Dec 2013 22:32:45 +0100 (CET)
 (envelope-from tijl@FreeBSD.org)
Date: Fri, 13 Dec 2013 22:32:44 +0100
From: Tijl Coosemans <tijl@FreeBSD.org>
To: Pedro Giffuni <pfg@FreeBSD.org>
Subject: Re: svn commit: r259326 - stable/10/contrib/tcpdump
Message-ID: <20131213223244.6ef4384f@kalimero.tijl.coosemans.org>
In-Reply-To: <52AB6845.7020504@FreeBSD.org>
References: <201312131932.rBDJW3iw088831@svn.freebsd.org>
 <CAF6rxgn70ddjbNSvEjEk4TtJ4dUD9__2jt8RUeHkcFjZ2wxEkw@mail.gmail.com>
 <52AB6845.7020504@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: svn-src-stable@freebsd.org,
 "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
 "src-committers@freebsd.org" <src-committers@freebsd.org>,
 Eitan Adler <eadler@freebsd.org>, svn-src-stable-10@freebsd.org
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Dec 2013 21:32:54 -0000

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