On 9/16/2013 21:09, Suresh Govindachar wrote: > > But I am puzzled by the following in the last quoted para above: "trunk > is where all development work will take place, unless the code in > question is known to be broken work-in-progress code" -- if the trunk is > where all the development work will take place then it is > work-in-progress code and is likely to have bugs (because it would not > have undergone release tests); in this situation, the only guarantee one > can enforce is that before commits, people ensure that the trunk > compiles and passes any regression tests.
WIP code as in revamping the entire math code etc, you can't do it in one night. So you do it in a branch while it is "UNDER CONSTRUCTION, incomplete, does not compile right yet, etc", until it is in a usable state, at which point you merge to trunk. Pushing to trunk simply means "My code should now be generally usable, but may not be bug-free or cover all corner cases". We don't have a dedicated QA team, not to mention pushing to trunk will expose it to a larger pool of testers. Yes, nobody commits directly to trunk without review and an OK acknowledgement. While we did have broken builds at times, they are quite rare and often quickly fixed or reverted. I made the mistake once of using a distinct branch for active development a long time ago, merging the code in took longer than developing it. Other parties were squirming because my merge broke their own branches while they too attempt to merge, see, they were not aware of my branch at all until it was merged suddenly without a 2-week advanced written notice. Likewise, I was not aware of what their branch contains. It plays exactly like bad game of musical chairs while development stalls in merge hell while "trunk" was sorted out. The lesson here is that merge frequently into trunk, so all your code is visible to everyone doing development, no sudden 100K LOC changes appearing out of nowhere in a few hours.
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
