Date: Mon, 16 Apr 2018 19:04:09 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Ian Lepore <ian@freebsd.org> Cc: Eitan Adler <eadler@freebsd.org>, Kyle Evans <kevans@freebsd.org>, "Rodney W. Grimes" <rgrimes@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r331722 - in stable/11: bin/cat bin/chflags bin/chmod bin/cp bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/hostname bin/kill bin/ln bin/ls bin/mkdir bin/mv bin/pax bin/ps bi... Message-ID: <20180416190409.GG63343@FreeBSD.org> In-Reply-To: <1523905221.69449.14.camel@freebsd.org> References: <1523837543.69449.8.camel@freebsd.org> <201804160028.w3G0S58v048517@pdx.rh.CN85.dnsmgr.net> <CACNAnaGTdR0qNL=4T674sV8NakndZtGv3PkD6Mf-xxRwK5Z%2BvA@mail.gmail.com> <CAF6rxgnyEht3CLoa=KZdoarAQRNrF2ONRw7v0hO9Hjt0OVxWcg@mail.gmail.com> <1523905221.69449.14.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--df+09Je9rNq3P+GE Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 16, 2018 at 01:00:21PM -0600, Ian Lepore wrote: > On Sun, 2018-04-15 at 18:08 -0700, Eitan Adler wrote: > > On 15 April 2018 at 17:53, Kyle Evans <kevans@freebsd.org> wrote: > > >=20 > > > On Sun, Apr 15, 2018 at 7:28 PM, Rodney W. Grimes > > > <freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > >=20 > > > > >=20 > > > > > On Wed, 2018-03-28 at 20:17 -0700, Rodney W. Grimes wrote: > > > > > >=20 > > > > > > [...] > > > > > > I tried to get this slowed down until we could get to a concens= es, > > > > > > I think our mess is as big now as it was before. > > > > > >=20 > > > > > Or bigger. I've just discovered this commit reverted stuff that w= asn't > > > > > part of the bad original MFC commit. Things I MFC'd to 11 before = this > > > > > revert are now missing changes and the symptoms don't show up unt= il a > > > > > module fails to load due to missing symbols. > > > > >=20 > > > > > I guess every change on the stable-11 branch between r330897 and > > > > > r331722 needs to be audited to see if MFC'd or changed code has b= een > > > > > unintentionally reverted. > > > > >=20 > > > > > Here's the example I've just run across... > > > > >=20 > > > > > r330897 merged this: > > > > >=20 > > > > > https://svnweb.freebsd.org/base/stable/11/sys/dev/spibus/ofw_spib= us.c?r1=3D302408&r2=3D330897 > > > > >=20 > > > > > Then I did some MFCing, then r331722 "reverted" this: > > > > >=20 > > > > > https://svnweb.freebsd.org/base/stable/11/sys/dev/spibus/ofw_spib= us.c?r1=3D331506&r2=3D331722 > > > > *sigh*=A0=A0Ok, I can at least do an audit of the r331722 > > > > that was suppose to be a revert and see what else I find. > > > >=20 > > > > I'll start on this tomarrow and get the first pass audit out fairly= early > > > > in the morning my time (PST) > > > >=20 > > > > Do we revert the attempted revert, then properly revert the origina= l? > > I am beyond confused. How did > > svn merge -c-r330897 . > > fail? > >=20 >=20 > If that's literally the command you entered, it may have been the extra > '-r' that caused a problem. To backout a single changelist, the command > is >=20 > =A0 svn merge -c -330897 . >=20 > I wonder if that extra -r separated the changelist number from the -c > option, and in effect did a reverse-merge by revision number of > everything back to r330897? >=20 In this example, both '-rNNNNNN' and '-NNNNNN' are synonymous. Glen --df+09Je9rNq3P+GE Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlrU86QACgkQAxRYpUeP 4pPJmg//QlNBvV7jI5wYie+2E0e6Xhb8SGaD6NBRY9OsgYHKGct7Xrnd9xgZ/LvZ 3ifmWs3dqboLDC6BPvAF33mIUt+CTUzcXApoctudaC6KYWA71O7YFfXPvPQo7VWk W6g6Ee3mqC5FgJmcBCOo5BOrVzk6knJ27n9r29pjd3S99B37Ll0xLf8V1ZmMtIB0 j8PAdo86F/aMNsBve6HLa+SRtsAA7s/WDIUsw+89ag+mWc/wPPegtWIVvNAO2ZdJ A5Z5v+uZM3uyetAaYL34WXusi5qvBHrfkatbzKyQe5KoA0yTDt5GkAI07VbCwsZc yqkJIvKOFNdGU1xOEir2m1iVVRd5Lo687j17FmbakIH1L+Ib+O4OAg2qfxOpzF0f 5jdksqZqfA3Fu+F0d+8Vl5PklH04qbxkwqMOrv2j2KJ5a7CwmQL4HC3EJAAte5zr rfj4NK70SlRvKfwCt+Z4+L4tyMrz5IVGX1tZ2NeMZTiJa+AwZfNoAReF+IeY5B5p R1Lqa5l3LEL1qrqlrgrK69e8xWxV3f0+c+VvN5AfszjBPY2TsS7xSkMCM8J25VHS HTu0kTAzTXYYMJ96UGPp34RbFPg9kRXuFVavZ4UuzjBquy1X00rzfcAJDFlHq7bA P5JoItrtsd2dVtprJ0SwMjz2pa8LIoq9oMOg737Hcb85CfB2/eU= =5JUl -----END PGP SIGNATURE----- --df+09Je9rNq3P+GE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180416190409.GG63343>