Right so you are rolling back the core changes, but not the plugin changes
on HEAD?
I'm not sure how you are going to execute it - sounds like a pain in the
butt.

I thought the branch was pretty much up to date with relevant changes on
HEAD and going along happily... So occasionally merging 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 :)
> 
> 
> Don't worry read the docs.
> 
> We don't strictly want to do a -j, as some things changed in 
> HEAD and need 
> to be reverted.
> --
> dIon Gillard, Multitask Consulting
> Blog:      http://blogs.codehaus.org/people/dion/
> 
> 
> [EMAIL PROTECTED] wrote on 18/08/2003 04:40:56 PM:
> 
> > What's -j do???
> > --
> > dIon Gillard, Multitask Consulting
> > Blog:      http://blogs.codehaus.org/people/dion/
> > 
> > 
> > Brett Porter <[EMAIL PROTECTED]> wrote on 18/08/2003 
> 04:31:26 
> > PM:
> > 
> > > Cool, so just doing a cvs update -j MAVEN_RC1_STABLE on HEAD?
> > Essentially
> > > what 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]
> > > > Sent: Monday, 18 August 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.
> > > > --
> > > > 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 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?
> > > > > 
> > > > > Sorry for any slow responses, seems like it is taking 
> 20 minutes
> to 
> > > > > get
> > > > mail
> > > > > through at the moment :(
> > > > > 
> > > > > Cheers,
> > > > > Brett
> > > > 
> 

Reply via email to