Date: Wed, 11 Oct 2017 12:44:30 -0600 From: Warner Losh <imp@bsdimp.com> To: John Baldwin <jhb@freebsd.org> Cc: Ngie Cooper <ngie@freebsd.org>, src-committers <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r324471 - head/sys/boot Message-ID: <CANCZdfp=mdXqbot3JJPQJja6SWHY=YcHQJg15vn=rYPRTsmr5w@mail.gmail.com> In-Reply-To: <2024262.CuRUiD5dcO@ralph.baldwin.cx> References: <201710100453.v9A4rQ6W078536@repo.freebsd.org> <CANCZdfq6TnT7AVwRZTKeAQg-U_LY-UiaXq9pCRvUjYLpUhntiQ@mail.gmail.com> <2024262.CuRUiD5dcO@ralph.baldwin.cx>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Oct 11, 2017 at 11:47 AM, John Baldwin <jhb@freebsd.org> wrote: > On Monday, October 09, 2017 10:56:45 PM Warner Losh wrote: > > DO NOT MAKE EDITS TO sys/boot. YOU ARE CREATING CONFLICTS FOR ME. > > > > DO NOT MAKE ANY COMMITS TO sys/boot. > > > > BACK OFF. > > > > Seriously, though, extra changes create extra friction, and these changes > > aren't worth any friction at all. I'm deleting LIBSAU and this > guarantees a > > conflict when I update. > > > > So please, do not make any edits to sys/boot whatsoever, no matter how > > trivial. > > > > At least until I'm done. > > > > Thanks. > > Umm, I know you are working on sys/boot but I never saw any mail or headsup > claiming a lock on that part of the tree. It would be a reasonable > assumption > for someone based on the public commits that you had finished a milestone > for > now. I only knew about you wanting to remove LIBSAU via a private reply > you > sent to my earlier mail, but there was no public mention that you have more > work. To that end I think this mail was a bit harsh. > The specific issue was that several people had made suggestions in this area, some of which were conflicting, and I was mulling over what the right thing to commit was. They were made to me, but in a public forum, in response to my original commit. Since I had other changes in flight, I wasn't sure the right way to roll them in. Then with no warning or heads up, the issue was forced by ngie committing changes to something that I'd just touched without even so much as a heads up. And it didn't help that the friction this created wasted 10 minutes of my time dealing with git svn rebase tripping over 3 or 4 commits in my queue. So I was harsh. Perhaps a bit too harsh and too public, but this wasn't a first offense. I'll try to moderate that in the future. Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfp=mdXqbot3JJPQJja6SWHY=YcHQJg15vn=rYPRTsmr5w>