RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-18 Thread Vincent Massol
Oh no please... I'm +1 to re-establish HEAD as the main development branch. Thanks -Vincent > -Original Message- > From: Brett Porter [mailto:[EMAIL PROTECTED] > Sent: 18 August 2003 09:23 > To: 'Maven Developers List' > Subject: RE: branch merge strate

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-18 Thread dion
s, right? :) http://maven.apache.org/developer-activity-report.html > > > > > -Original Message- > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > Sent: Monday, 18 August 2003 5:16 PM > > To: Maven Developers List > > Subject: RE: branch merg

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-18 Thread Brett Porter
ht lead on recent commits, right? :) http://maven.apache.org/developer-activity-report.html > -Original Message- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Sent: Monday, 18 August 2003 5:16 PM > To: Maven Developers List > Subject: RE: branch merge strategy WA

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-18 Thread dion
Brett Porter <[EMAIL PROTECTED]> wrote on 18/08/2003 05:08:23 PM: > Right so you are rolling back the core changes, but not the plugin changes > on HEAD? There've been very few plugin changes on HEAD, and I've rolled them all into the branch, so no, I'm not picking up plugin changes on HEAD as a

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-18 Thread Brett Porter
stuff and repairing HEAD should work out ok. > -Original Message- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Sent: Monday, 18 August 2003 4:48 PM > To: Maven Developers List > Subject: RE: branch merge strategy WAS: some cvs commit thread :) > > &

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-17 Thread dion
hat we'd been talking about, but doing it as a once only and closing > off > > the branch, right? > > > > - Brett > > > > > > > > > -Original Message- > > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > >

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-17 Thread dion
about, but doing it as a once only and closing off > the branch, right? > > - Brett > > > > > -Original Message- > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > Sent: Monday, 18 August 2003 4:18 PM > > To: Maven Developers List &g

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-17 Thread Brett Porter
gust 2003 4:18 PM > To: Maven Developers List > Subject: RE: branch merge strategy WAS: some cvs commit thread :) > > > Nope, > > it's a merge of recent changes with Stable, except the core > changes which > will be reapplied later. > -- >

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-17 Thread dion
Nope, it's a merge of recent changes with Stable, except the core changes which will be reapplied later. -- dIon Gillard, Multitask Consulting Blog: http://blogs.codehaus.org/people/dion/ Brett Porter <[EMAIL PROTECTED]> wrote on 18/08/2003 04:09:10 PM: > > Tomorrow Dion is going to move

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-17 Thread Brett Porter
> 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. > Sounds like a good plan, but could you clarify "move stable back to HEAD"? How exactly will that be done? Is this rolling back what is in HEAD now? Sorr

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-17 Thread dion
Jason van Zyl <[EMAIL PROTECTED]> wrote on 18/08/2003 03:40:14 PM: > 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 im

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-17 Thread Jason van Zyl
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

RE: branch merge strategy WAS: some cvs commit thread :)

2003-08-17 Thread Brett Porter
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? - Brett > -Original Message- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED