Date: Thu, 15 Mar 2018 18:07:15 +0100 From: Oliver Pinter <oliver.pinter@hardenedbsd.org> To: Warner Losh <imp@bsdimp.com> Cc: Ian Lepore <ian@freebsd.org>, src-committers <src-committers@freebsd.org>, Eitan Adler <eadler@freebsd.org>, Justin Hibbits <jrh29@alumni.cwru.edu>, "svn-src-stable@freebsd.org" <svn-src-stable@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-stable-11@freebsd.org" <svn-src-stable-11@freebsd.org>, Andriy Gapon <avg@freebsd.org>, "Rodney W. Grimes" <rgrimes@freebsd.org> Subject: Re: svn commit: r330972 - stable/11/share/misc Message-ID: <CAPQ4fft0BMXVN1UZqX8kCHA7WW75aboCKgd8qVhC9eoVE3w31g@mail.gmail.com> In-Reply-To: <CANCZdfrWXqBNbkomSxZ5ZUoenjfh72QmBc_MfrD9wqc7CctXMQ@mail.gmail.com> References: <201803151614.w2FGEttu093805@pdx.rh.CN85.dnsmgr.net> <1521130827.99081.43.camel@freebsd.org> <CANCZdfoX2-Bq3y%2B_0HOc4553WPTf1ccf3nKpkRB8XvvVz6YxzQ@mail.gmail.com> <CANCZdfrWXqBNbkomSxZ5ZUoenjfh72QmBc_MfrD9wqc7CctXMQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thursday, March 15, 2018, Warner Losh <imp@bsdimp.com> wrote: > On Thu, Mar 15, 2018 at 10:31 AM, Warner Losh <imp@bsdimp.com> wrote: > > > > > > > On Thu, Mar 15, 2018 at 10:20 AM, Ian Lepore <ian@freebsd.org> wrote: > > > >> On Thu, 2018-03-15 at 09:14 -0700, Rodney W. Grimes wrote: > >> > > > >> > > On Thu, 2018-03-15 at 10:52 -0500, Justin Hibbits wrote: > >> > > > > >> > > > On Thu, Mar 15, 2018 at 10:46 AM, Ian Lepore <ian@freebsd.org> > >> > > > wrote: > >> > > > > > >> > > > > > >> > > > > I agree completely with all of this.??It bothers me how many > >> > > > > committers > >> > > > > have the attitude that handling MFCs is not part of being a > >> > > > > committer. > >> > > > Never attribute to arrogance that which can adequately be > >> > > > explained > >> > > > by > >> > > > sheer laziness ;) > >> > > > > >> > > > - Justin (guilty of marking changes as MFC after, and ignoring > >> > > > them > >> > > > for far too long) > >> > > > > >> > > Laziness and procrastination I understand -- I own a lovely glass > >> > > house > >> > > in that neighborhood. ?I tend to put off MFCs for way too long then > >> > > every few months have to spend a whole weekend catching up. > >> > MFC: 1 week (by pool|self) #defaults to self if missing > >> > > >> > There is already a very nice tracking tool for outstanding MFC's, > >> > if we added a bit of smarts in its parser, and created a pool of > >> > MFC commiters (Eitan seems to have started one :-)) those who > >> > do not want to do there own MFC work could pass the hat. > >> > >> If you're talking about the MFC after: field in commits, I don't use > >> it. I have about zero tolerance for being nagged by anybody about > >> anything, and that goes double for robots nagging me with spam mail. > >> > >> The MFC tool that works well for me is gonzo's MFCTracker site [*] that > >> doesn't require extra markup in the commit messages. > >> > > > > I also have a MFC tool for git, but it's n > > > > [[ stupid track pad and too easy button pushes... ]] > > but it's not ready for prime time. It's useful if you have a list of things > you want to MFC for playing them onto the stable branch so you can test > before committing to svn stable. It shows the big issues with moving to git > as the source of truth, though. We have way too much traffic in the repo to > have git cherry to produce any kind of reasonable output (too many changes, > can't restrict to a subset of the tree, no way to check prior commits to > files affected, etc), and the git cherry-pick command relies a bit too much > on the merge magic, so it doesn't record merges (there is no merge-info in > git). > > However, I could dust off the tool and fix up the rough edges if there's > any interest at all. Kyle Evans used it to MFC my crazy src/stand stuff... > > I use this script to merge / cherry-pick changes from master: https://github.com/opntr/opBSD-ng-tools/blob/master/git/opBSD_mfc.sh > Warner > _______________________________________________ > svn-src-stable-11@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11 > To unsubscribe, send any mail to " > svn-src-stable-11-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPQ4fft0BMXVN1UZqX8kCHA7WW75aboCKgd8qVhC9eoVE3w31g>