|
From: Ion-Mihai T. <it...@Fr...> - 2009-05-23 18:28:38
|
On Sat, 23 May 2009 17:34:21 +0200 "Steve" <ste...@gm...> wrote: > -------- Original-Nachricht -------- > > Datum: Fri, 22 May 2009 22:46:16 +0300 > > Von: Ion-Mihai Tetcu <it...@Fr...> > > An: "SteveB" <ste...@us...> > > CC: dsp...@li..., > > dsp...@li... Betreff: Re: [Dspam-devel] > > [Dspam-commit] dspam branch, master, updated. > > e8a7e100c6e8e804874ed8c1bad390451de7cad3 [ .. ] > > Yay! You're back \o/ > > > Hallo Ion-Mihai > > Yes. I am back. I needed to take some time "offline" because of a > private issue. I know, I hope you're OK now. > But now I am back. +/- at least. I submitted a bunch of patches. I > tried to split them up in logical chunks and because of YOU I added > everywhere where I could a comment when submitting the patch. So now > you should know what I have done :) :-) There's no such thing as a to verbose commit message. Speaking of which: maybe it's good idea to reference the commit hash ie. instead of 'Updated CHANGELOG' Update for 3d69325d2ac31d03926f529820acfd0b75c5439b, 45f829160366a5bdbaefda64ed3be61e1b1953fd .... > > I believe some of your commits address bug reports from the > > tracker? If so, please add to you commit message > > BugID: the_bug_id > > so that we can easily who's responsible for fixing what :-) > > Also please don't forget to change the status of the respective bug. > > > > Should this commits be merged down in release branches? > > If so, adding: > > MFM: X days > > will help us remember that. > > > Alexander already explained me what this MFM is but I still don't get > it. MFM = Merge From Master Merge what from master? I am already > working with git on the master so what does need to be merged from > there again? I don't get it. Merge "down" in stable/release branches (RELENG*). We're using MASTER as testing ground for everything: bug-fixes, improvements, small, big changes. Supposedly they will be tested before merged merged down, the idea being to have the stable branches OK at all the times. > Explain me as well what the days thing is? Days to wait until the > patch is pushed into master (but I am already working on the master > with git)? Pushed down in RELENG_M The interval is just so that I can do a script that will send remainders and it's at committer's discretion since he should know best how much testing is needed, how big destabilizing impact it can have, etc. As a rule of thumb I'd say: - 1 day for comments, docs, small changes - instant for security fixes - 1-3 weeks for bigger changes (I was one of your commits with one week) Merging from RELENG_M to RELENG_M_m and RELENG_M_m_u would be done for the releases only (some days before we start a new release cycle). -- IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" FreeBSD committer -> it...@Fr..., PGP Key ID 057E9F8B493A297B |
