If bugs are fixed in the release branches (esp. during the beta cycles) they need to be merged into the head.
What I was really getting at, with the first part of the email, is that we should not have to do this during the beta cycle. We should only branch if we have changes to make for an update of an old release. I'm trying to make an argument against using branches in the way that we have in the past, and that it seems we are doing now. I'm arguing against using branches at all if we can manage it. I'm not a cvs expert, but it seems like we are not doing this correctly if we create a branch before we make a release. We should be rtag'n and not branch'n. ----- Original Message ----- From: "Clayton Harbour" <[EMAIL PROTECTED]> To: "Scott Hernandez" <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]> Sent: Wednesday, November 12, 2003 7:43 PM Subject: RE: [nant-dev] NAnt Tag and Branch policies > Scott, > > > The reason to keep branches to a min is that changes from one branch > to > > not > > affect another. So if we fix something in 0.8.3 branch, we also need > to > > fix > > all subsequent branches. Branches also require special changes to the > way > > we > > as developers work. > > Sorry Scott, I am a little confused. Are we merging the changes in the > release branches back into the head? Using something like the syntax: > cvs update -j [main_trunk] -j [release_branch] > (stolen shamelessly from > http://www.netbeans.org/community/sources/branches.html) > > In theory I think that it is a lot like generating patch files and just > applying it to the other branch. There is even a process identified on > the netbeans site (link above) that we might use as a template. ------------------------------------------------------- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ _______________________________________________ nant-developers mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/nant-developers
