From owner-svn-src-stable@FreeBSD.ORG Fri Dec 13 21:42:15 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 9CB2C8B9 for ; Fri, 13 Dec 2013 21:42:15 +0000 (UTC) Received: from mail-qa0-x231.google.com (mail-qa0-x231.google.com [IPv6:2607:f8b0:400d:c00::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5108410A9 for ; Fri, 13 Dec 2013 21:42:15 +0000 (UTC) Received: by mail-qa0-f49.google.com with SMTP id ii20so1197592qab.15 for ; Fri, 13 Dec 2013 13:42:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=OUiPIuGSom34TU8x3gKp0CXQNnRBruRTx/HuiW4Pv1E=; b=cW3kfgaXmujXgnIpOjOQGPQ3mi148Q6Zi7YahFlZHcZM9vi8jhR623Akmhg3HytUPG 5GYlb1Yr5C/PJBS25cPVisl5EUSpHTdR29qYlGWXFaxw+clQVG+zfOI8rdAVfvyjEpc0 KwtzdtSvFAUA5e1C8dkhukDZG3Ti98ltJtKIc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=OUiPIuGSom34TU8x3gKp0CXQNnRBruRTx/HuiW4Pv1E=; b=kQF/ydNQ/nho23Y44eyp04guwnM8dP6PdznVnrBy+4ocxEgryqKwEDhREm8eTQ/9fr 7RB8IM0Vl206bq/RK1JA/AH1xJFk6Qe6wc373bsXlNawOzyduRiD7v+tUTDXtXnUkwxO 90W4zQM+SeZ1Fsy1rGgHY1NnrBwxj+QUYShSBu2+Gp0OgXeRZbWWKwXNN51vMOJlpNjO ubR6RGic+kaXwDusCQWP6bxxvBt+CrXdS05H19cuzRZtAQVheqkMVRQRvHrCfM11B+U3 YO1vKIQzWE+ddMOztWZuNSbAy83iNzr/XRzAP9G+4RUqQsC6bLotMu2w9mSUv2sJef5N CPow== X-Gm-Message-State: ALoCoQnD1FZ7UfKKM//dCad1CN/NCaDyUDhzpyynqM0nN46LML33guq0pKvPqlCkyXk7p0G5L2s9 X-Received: by 10.229.194.1 with SMTP id dw1mr8613536qcb.20.1386970934170; Fri, 13 Dec 2013 13:42:14 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.96.86.42 with HTTP; Fri, 13 Dec 2013 13:41:44 -0800 (PST) In-Reply-To: <20131213223244.6ef4384f@kalimero.tijl.coosemans.org> References: <201312131932.rBDJW3iw088831@svn.freebsd.org> <52AB6845.7020504@FreeBSD.org> <20131213223244.6ef4384f@kalimero.tijl.coosemans.org> From: Eitan Adler Date: Fri, 13 Dec 2013 16:41:44 -0500 X-Google-Sender-Auth: FOnsdPZPfUdQSqxjHKrr8khbA0s Message-ID: Subject: Re: svn commit: r259326 - stable/10/contrib/tcpdump To: Tijl Coosemans Content-Type: text/plain; charset=UTF-8 Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , Pedro Giffuni , "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 21:42:15 -0000 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. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams