Fixing bugs on trunk or 1.1 branch?

Topics: Developer Forum
Mar 16, 2007 at 11:28 PM
We might want to release a 1.11 patch in a month or so to fix some bugs (write-zip modifying file write time, get-adobject limited to 1000 objects, etc). Should we be fixing bugs on the 1.1 branch and then reverse integrate those bugs into the trunk? That would allow us to work on new features in trunk without worrying about how to remove those incomplete features in order to do a 1.11 patch release. Thoughts?
Mar 17, 2007 at 5:17 PM
as long as we keep the bugfix checkins atomic and to a single changelist, it shouldn't be a problem to merge back the simpler fixes into 1.1?
Mar 18, 2007 at 2:15 AM
backporting is root of all evil ;) i'm going to make the fixes in the 1.1 branch
Mar 20, 2007 at 1:38 AM
ok, sounds like a plan. 1.1 is the "one true" branch, until otherwise stated.
Mar 20, 2007 at 5:03 AM
Well actually I think we should do new features on the trunk. Bug fixes should be done on the 1.1 branch and then RI'd to trunk. This gives us the flexibility to cut a 1.11 patch release if we encounter a serious enough bug without having to worry about how to excise new features that aren't close to completion.
Mar 20, 2007 at 9:22 PM
sorry, that's what I meant Keith -- bugfixes on 1.1, not new features -- it is the discussion title after all! ;-)
Mar 27, 2007 at 3:19 AM
and like some kind of idiot, I check the last three fixes into 1.2.