Date: Fri, 02 Aug 2019 16:11:00 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r350548 - head/sys/contrib/ipfilter/netinet Message-ID: <201908022311.x72NB0d8030965@slippy.cwsent.com> In-Reply-To: <201908022307.x72N7Ib0010930@slippy.cwsent.com> References: <201908022258.x72MwjjE001139@repo.freebsd.org> <201908022307.x72N7Ib0010930@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <201908022307.x72N7Ib0010930@slippy.cwsent.com>, Cy Schubert writes: > In message <201908022258.x72MwjjE001139@repo.freebsd.org>, Cy Schubert > writes: > > Author: cy > > Date: Fri Aug 2 22:58:45 2019 > > New Revision: 350548 > > URL: https://svnweb.freebsd.org/changeset/base/350548 > > > > Log: > > MFC after: 3 days > > > > This was stupid. The initial git commit had to be undone because the > file in my tree was out of date. After git rebase -i and recommit I > must have inadvertently deleted the commit log message, which did say > #include whitespace cleanup. Best practice to avoid the initial git svn dcommit failure would be to git fetch && git svn rebase before git commit rather than before git svn dcommit, though the race still exists. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908022311.x72NB0d8030965>