Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Dec 2013 22:59:13 +0100
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        Eitan Adler <eadler@freebsd.org>
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
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>

next in thread | previous in thread | raw e-mail | index | archive | help
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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131213225913.6a235dbe>