From owner-svn-src-stable@FreeBSD.ORG Fri Dec 13 20:11:06 2013 Return-Path: Delivered-To: svn-src-stable@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 582077AF for ; Fri, 13 Dec 2013 20:11:06 +0000 (UTC) Received: from nm39-vm9.bullet.mail.bf1.yahoo.com (nm39-vm9.bullet.mail.bf1.yahoo.com [72.30.239.153]) by mx1.freebsd.org (Postfix) with SMTP id E24F41820 for ; Fri, 13 Dec 2013 20:11:05 +0000 (UTC) Received: from [98.139.212.149] by nm39.bullet.mail.bf1.yahoo.com with NNFMP; 13 Dec 2013 20:04:23 -0000 Received: from [68.142.230.77] by tm6.bullet.mail.bf1.yahoo.com with NNFMP; 13 Dec 2013 20:04:23 -0000 Received: from [127.0.0.1] by smtp234.mail.bf1.yahoo.com with NNFMP; 13 Dec 2013 20:04:23 -0000 X-Yahoo-Newman-Id: 771516.71567.bm@smtp234.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: FReGZEcVM1nRzYZLDCj0ETN1IZ_pGQmSYgfqEZsOK7QWOHo YKUSWJzcrNWBoiBR_vfNMmil3ozJ6OTXVpNXtVhA8H30nHphQ4aVBLGAVc.v 2xGK7omuzkx6Gc3iFjax1CPHYty7OajTdBtrSLfc9I2i_ZQ5sc1bHwKwugXV 1Qv.c8l86CAin2DiJYk5O8zKp9Xepp2feVHj7bLzJyldezJc9tgeznnYzn1n S8_xZKlSb73YM_Dh4ItQKQyiMY66wuPAwfpusalTS1WGIr0xa7VWA02tPq6O 1crWz5GIyZ89fJlhIodZJ77fKVtayqh8SYoyW7E.xpuxj50OsjAsiPb3V_1Y NIyZtr_GykcuV2MgfABopnNqk5lymUWwX_hnbKvGw3jXsCUVcTXR2cQtG3R4 0aneDAZQqfWPsttc4RsGo.GDCjGi5ugprzH8q_jA9JcBKHKBOPGX3ga7Sc5p hMB_D_W3d3yYhW1LihKM5vUbcQArE.sZ91acxp069gVBNX3NMfhOOs35Awex zl7P7YXAzNF83c_fj0c598rQM6zi1eaqjL.wP03POuEY8C4xhq0BbTA-- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with plain [98.139.211.125]) by smtp234.mail.bf1.yahoo.com with SMTP; 13 Dec 2013 20:04:23 +0000 UTC Message-ID: <52AB6845.7020504@FreeBSD.org> Date: Fri, 13 Dec 2013 15:04:21 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Eitan Adler Subject: Re: svn commit: r259326 - stable/10/contrib/tcpdump References: <201312131932.rBDJW3iw088831@svn.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2013 20:11:06 -0000 On 13.12.2013 14:43, Eitan Adler wrote: > On Fri, Dec 13, 2013 at 2:32 PM, Pedro F. Giffuni 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. I then tried: svn merge --ignore-ancestry -c r258573 ^/head . (failed) Next attempt was: svn merge -c r258571 ^/vendor/tcpdump/dist contrib/tcpdump (also failed) finally this worked: svn merge --ignore-ancestry -c r258571 ^/vendor/tcpdump/dist contrib/tcpdump Hope that helps someone with the same issue ;). Pedro.