Date: Thu, 04 Feb 1999 15:09:01 -0800 From: "Jordan K. Hubbard" <jkh@zippy.cdrom.com> To: Adam David <adam@veda.is> Cc: adam@FreeBSD.ORG (Adam David), cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/sys/i386/conf GENERIC Message-ID: <21047.918169741@zippy.cdrom.com> In-Reply-To: Your message of "Thu, 04 Feb 1999 20:14:25 GMT." <199902042014.UAA15925@veda.is>
next in thread | previous in thread | raw e-mail | index | archive | help
Not to single you out, but I'm glad you raised this so that I can comment more widely: I'm not going to be merging anything more than my own work into 3.1! That means that if you want something merged during the freeze, ask me about it and I'll say "yes" or "no", depending, and expect you (the committer, not just Adam :) to follow it up from there. If you don't merge it and you haven't made arrangements with some other committer who's not me to merge it, it won't get merged. Don't also get me wrong - if you're just marking it as a 'merge candidate' in the commit message for your own benefit to be used in some later sweep, that's fine too, I just wanted to make sure you weren't marking it for what you thought was someone else's benefit. :) As to why I'm not doing the merging myself even though I sort of "own" the branch during this time, I can only say that I've done that one too many times in the past and I'm certainly not going through the 19MB of diffs between 3.0-RELEASE and RELENG_3 this time. Not only is this a lot of work, but it's actually more error-prone and less healthy for FreeBSD if one person tries to eyeball that many lines of text and meaningfully merge things from it. The first couple of megabytes go fine, after that one simply becoming a merge zombie with selection criteria of highly debatable merit. :) - Jordan To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?21047.918169741>