From owner-svn-src-stable@FreeBSD.ORG Fri Dec 13 22:46:07 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 DBE99E9B for ; Fri, 13 Dec 2013 22:46:06 +0000 (UTC) Received: from nm7.bullet.mail.bf1.yahoo.com (nm7.bullet.mail.bf1.yahoo.com [98.139.212.166]) by mx1.freebsd.org (Postfix) with SMTP id 884F9160F for ; Fri, 13 Dec 2013 22:46:06 +0000 (UTC) Received: from [98.139.212.151] by nm7.bullet.mail.bf1.yahoo.com with NNFMP; 13 Dec 2013 22:45:59 -0000 Received: from [68.142.230.78] by tm8.bullet.mail.bf1.yahoo.com with NNFMP; 13 Dec 2013 22:45:59 -0000 Received: from [127.0.0.1] by smtp235.mail.bf1.yahoo.com with NNFMP; 13 Dec 2013 22:45:59 -0000 X-Yahoo-Newman-Id: 36679.47825.bm@smtp235.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: e5kiC_8VM1l.Db7EeLQpMII3jGQ9YHpChdADB1BHXE3DxhT UbT7qLyjuoFnK3hi5HSLFAkR9ZviWF5OWVYncg6NbGirNzJL56onz81cTXZT ne.Ciq1fEyRxPRCTo0lUOVodas6B8hnlACtcRexYHUaYxLWE4MMXpxXrvOGf tC19XYq8GWAqweTEDUviTQ4SJl46wNV_SkY.WpQX11Pw4NNGw6kufJxdPG3j oN7.4AElU7VYBbs4wbLsUBirTxiIBJp9LD1G6D0yLZ6m.0H24md3Ri_3pJv9 8EhGRYE0BHyJL_QKtQDAHsgqQ9jMjSB3sgWKkd6vNyb6sifdzxZExDhRcz7U mgsN1ywAJvvDlpm1ZHNSi4tlmYQsyxgPK3xA6NtR96NZd7gygh_CZ_FyxocD KtWSCkaik.i3z1gd6x4OllB5J16ZlQt5o5lAM7F_wVs4IVrJHlxml6106USH .v_AMv3NsMp1nivnQmd2oUM0PzfgQXHXcR17BX0YDYjzJ0R58IY9rLmH52Os befbSzZNjcLVvTX1ys6SKZoI67k.M.a.HlaSYgFajVXrWWfR_L5sq2g-- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with plain [98.139.211.125]) by smtp235.mail.bf1.yahoo.com with SMTP; 13 Dec 2013 22:45:58 +0000 UTC Message-ID: <52AB8E24.9060008@FreeBSD.org> Date: Fri, 13 Dec 2013 17:45:56 -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: Tijl Coosemans , Eitan Adler Subject: Re: svn commit: r259326 - stable/10/contrib/tcpdump References: <201312131932.rBDJW3iw088831@svn.freebsd.org> <52AB6845.7020504@FreeBSD.org> <20131213223244.6ef4384f@kalimero.tijl.coosemans.org> <20131213225913.6a235dbe@kalimero.tijl.coosemans.org> In-Reply-To: <20131213225913.6a235dbe@kalimero.tijl.coosemans.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: svn-src-stable@freebsd.org, "src-committers@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 22:46:07 -0000 On 13.12.2013 16:59, Tijl Coosemans wrote: > On Fri, 13 Dec 2013 16:41:44 -0500 Eitan Adler wrote: >> On Fri, Dec 13, 2013 at 4:32 PM, Tijl Coosemans 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 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. Thank you, I guess it also required for stable/9? I merged it by the same procedure in r259327. Pedro.****