From owner-svn-src-all@FreeBSD.ORG  Fri Dec 13 22:00:26 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 602B15CC;
 Fri, 13 Dec 2013 22:00:26 +0000 (UTC)
Received: from mailrelay012.isp.belgacom.be (mailrelay012.isp.belgacom.be
 [195.238.6.179])
 by mx1.freebsd.org (Postfix) with ESMTP id 2BC0511CD;
 Fri, 13 Dec 2013 22:00:24 +0000 (UTC)
X-Belgacom-Dynamic: yes
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AmoGAKiCq1JbsVZ9/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:59:15 +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 rBDLxEOk013851;
 Fri, 13 Dec 2013 22:59:14 +0100 (CET)
 (envelope-from tijl@FreeBSD.org)
Date: Fri, 13 Dec 2013 22:59:13 +0100
From: Tijl Coosemans <tijl@FreeBSD.org>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r259326 - stable/10/contrib/tcpdump
Message-ID: <20131213225913.6a235dbe@kalimero.tijl.coosemans.org>
In-Reply-To: <CAF6rxg=33_7bjveGxjhfCj9VYa6NtFV-imOXv1Kx=T0ef8tMVQ@mail.gmail.com>
References: <201312131932.rBDJW3iw088831@svn.freebsd.org>
 <CAF6rxgn70ddjbNSvEjEk4TtJ4dUD9__2jt8RUeHkcFjZ2wxEkw@mail.gmail.com>
 <52AB6845.7020504@FreeBSD.org>
 <20131213223244.6ef4384f@kalimero.tijl.coosemans.org>
 <CAF6rxg=33_7bjveGxjhfCj9VYa6NtFV-imOXv1Kx=T0ef8tMVQ@mail.gmail.com>
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>,
 Pedro Giffuni <pfg@freebsd.org>,
 "src-committers@freebsd.org" <src-committers@freebsd.org>,
 svn-src-stable-10@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Dec 2013 22:00:26 -0000

On Fri, 13 Dec 2013 16:41:44 -0500 Eitan Adler wrote:
> On Fri, Dec 13, 2013 at 4:32 PM, Tijl Coosemans <tijl@freebsd.org> wrote:
>> 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
> 
> I think this should still be done, along with a --record-only merge.

Yes, done in r259334.