Sorry, I should have read more carefully. I see that I have to put the
report into "Waiting for Feedback" and add you to the "Waiting For".
Crawford Currie wrote:
> Thanks for clarifying this, Kenneth. It might be a good idea to improve
> the doc in the bugs web (the label above the radio buttons), as I for
> one wasn't aware I was supposed to check into both branches.
> I don't have the patch branch checked out, so what is the process I have
> to follow to signal to you that a fix I just put in is *available* for
> the next patch release, but not merged? Most of the fixes I do could
> potentially be merged, but I feel it is up to the person building the
> patch to have the final say in that. Otherwise I may check in changes
> you then feel you have to revert. Do I just check the bug as "minor" and
> wait for you to find it?
> Kenneth Lavrsen wrote:
>> I just discovered by chance that a bug item was fixed and set to Waiting
>> for Release but not checked into Patch04x01
>> I walked through all Waiting for Release items and found round 5 more
>> with the same. It is pure chance that I notice this.
>> This is probably because the roles are not clearly enough defined.
>> So let us wrap up the game rules.
>> A bug report targeted for a patch release cannot be set to Waiting for
>> Release unless you checked in the bug fix to both MAIN and Patch04x01
>> Bug reports targeted for a patch release have these properties
>> - Urgent and important for users to have fixed ASAP
>> - Well tested fixes. Do not take risks please.
>> - Harmless but helpful doc updates that cannot possibly harm anything
>> but can be a help to users.
>> - Fixes that the release manager thinks should be added even if they are
>> not urgent. (rare)
>> Bug reports that should never be targeted for next patch release
>> - Enhancements that adds new features. (code - not docs)
>> - Major code updates that are risky and may break something
>> - Untested code.
>> - Code refactorings that are supposed to not break anything
>> - MAKETEXT changes that breaks translations
>> - Fixes that make the release manager wet his pants
>> - ANY FIX that is related to plugins and addons and contribs that are
>> not among the ones that are distributed by default with TWiki
>> If a bug item is fixed and targeted for patch then please check in the
>> fix on both MAIN and Patch04x01
>> If a bug item is targeted for Freetown release (next minor or major) you
>> only check it into MAIN.
>> Non default plugins are checked into MAIN only.
>> Some exceptions.
>> - Fixes to the build contrib that benefits next Patch should be checked
>> in to both Patch04x01 and MAIN. The reason for this is that the patch
>> release is built from the BuildContrib within the Patch04x01 tree.
>> - Fixes to test cases - both the TestCases web and the unit tests should
>> be checked in to both Patch04x01 and MAIN so we get the maximum test
>> coverage. If a test cases is related to a new feature only added to MAIN
>> then naturally you only check it in to MAIN.
>> IF YOU ARE IN DOUBT if a fix should be merged to next patch release then
>> check in the fix on MAIN. And put the bug item in Waiting for Feedback
>> and put me on the Waiting For. Then I will pick it up and if I agree -
>> or many encourage the inclusion - I'll take care of the merging and set
>> the bug item to Waiting for Release.
>> It is important that the community helps keeping the two parallel
>> branches up to date. We have only the two. We need the Patch04x01 for
>> the patch releases and the MAIN to allow developers to do long term and
>> more risky type of work.
>> I cannot possibly maintain the overview and keep up to date on every
>> detail alone. And keep an eye on me too because I am also making mistakes!
>> Kenneth Lavrsen,
>> Glostrup, Denmark
>> Home Page - http://www.lavrsen.dk
>> Take Surveys. Earn Cash. Influence the Future of IT
>> Join SourceForge.net's Techsay panel and you'll get the chance to share your
>> opinions on IT & business topics through brief surveys - and earn cash
>> TWiki-Dev mailing list
Crawford Currie - C-Dot Consultants http://c-dot.co.uk - landline:
+44-1606-330-242 - mobile: +44-7837-877-956 - A WikiRing Partner