Date: Fri, 13 Dec 2013 15:04:21 -0500 From: Pedro Giffuni <pfg@FreeBSD.org> To: Eitan Adler <eadler@freebsd.org> Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" <svn-src-all@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: <52AB6845.7020504@FreeBSD.org> In-Reply-To: <CAF6rxgn70ddjbNSvEjEk4TtJ4dUD9__2jt8RUeHkcFjZ2wxEkw@mail.gmail.com> References: <201312131932.rBDJW3iw088831@svn.freebsd.org> <CAF6rxgn70ddjbNSvEjEk4TtJ4dUD9__2jt8RUeHkcFjZ2wxEkw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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. 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52AB6845.7020504>