On Mon, 2003-08-18 at 01:12, Brett Porter wrote: > Is there any consensus about merging the branch in this way? > > How are the developers currently building HEAD so that we can check changes > are compiling in ok? I imagine a certain subset of plugins are working?
Tomorrow Dion is going to move the stable back to HEAD. We made an error in judgement. Then I will merge stuff back in as I have it. So a bit of a summary: - I am going to focus on the memory leak i.e. merge the fixes I have into what will be HEAD. - Dion is going to touch up the plugin download/install goodies. This will let us separate the plugins from the core. - We'll create components in JIRA for each of the plugins (ben has done this mostly) and then move plugin issues listed for 1.0 to their respective component in JIRA. This will definitely help boatloads. - We'll revamp the list of issues for 1.0 try to knock them off and then release. > - Brett > > > -----Original Message----- > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > Sent: Thursday, 14 August 2003 1:44 PM > > To: Maven Developers List > > Subject: RE: cvs commit: > > maven/src/java/org/apache/maven/project Project.j ava > > > > > > Sounds like a plan to me. Everyone else??1 > > -- > > dIon Gillard, Multitask Consulting > > Blog: http://blogs.codehaus.org/people/dion/ > > > > > > Brett Porter <[EMAIL PROTECTED]> wrote on 14/08/2003 > > 01:33:04 PM: > > > > > Right. The problem with that is, when it comes time to > > update -j onto > > HEAD, > > > that entire change will conflict if I remember rightly. I'm not > > > exactly > > sure > > > - it might not report a conflict because they are the same, > > but I have > > > a feeling it does. > > > > > > How we've tended to do it here is merge the branch down to > > HEAD first, > > merge > > > the changes up to the branch, then tag the branch. That way, next > > > update > > can > > > only get the differences since that tag and it doesn't get confused. > > > > > > Does that sound like a good thing to do to make the branch > > management > > > easier? I imagine it will probably be around for a while, > > and may need > > to be > > > used again for a 1.0 vs 1.1 thing. > > > > > > - Brett > > > > > > > -----Original Message----- > > > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > > > Sent: Thursday, 14 August 2003 1:28 PM > > > > To: Maven Developers List > > > > Subject: RE: cvs commit: > > > > maven/src/java/org/apache/maven/project Project.j ava > > > > > > > > > > > > I merged from HEAD into the branch. Just manually using > > > > Eclipse. I figure > > > > that way the Branch will be closer to HEAD. > > > > -- > > > > dIon Gillard, Multitask Consulting > > > > Blog: http://blogs.codehaus.org/people/dion/ > > > > > > > > > > > > Brett Porter <[EMAIL PROTECTED]> wrote on 14/08/2003 > > > > 12:36:42 PM: > > > > > > > > > Merged them down to HEAD? Manually, or with update -j? > > > > > > > > > > > -----Original Message----- > > > > > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > > > > > Sent: Thursday, 14 August 2003 12:33 PM > > > > > > To: Maven Developers List > > > > > > Subject: RE: cvs commit: > > > > > > maven/src/java/org/apache/maven/project Project.j ava > > > > > > > > > > > > > > > > > > Yep, > > > > > > > > > > > > I did some of that yesterday with the cactus plugin and docs. > > > > > > -- > > > > > > dIon Gillard, Multitask Consulting > > > > > > Blog: http://blogs.codehaus.org/people/dion/ > > > > > > > > > > > > > > > > > > -- jvz. Jason van Zyl [EMAIL PROTECTED] http://tambora.zenplex.org In short, man creates for himself a new religion of a rational and technical order to justify his work and to be justified in it. -- Jacques Ellul, The Technological Society --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
