According to Mike's doc, I create the branch myself and then run everything from the branch. So I think once pushing everything from the trunk to the branch I should be able to do everything like normal.
-- Jesse From: Nicholas Gallardo <[email protected]> To: [email protected] Date: 06/14/2010 10:46 AM Subject: Re: Merging trunk with 1.0 branch I think Jesse was going to push the changes to the branch, create the tag, and then run the release from there. It's the same as other releases, but the scripts aren't doing the branching, etc. Jesse, that may be something to consider before running the scripts. I can't remember if they branch and then create the tag, or if you create the branch and it tags it for you. If it's the latter, then everything should be fine. -N ----- Original Message ---- From: Mike Rheinheimer <[email protected]> To: [email protected] Sent: Mon, June 14, 2010 10:31:38 AM Subject: Re: Merging trunk with 1.0 branch Yeah, that works for me too. You'll have to adjust in your head the instructions on the Wink release management wiki. It's written for running the release from a branch; you'll be running it from trunk. That's probably easier anyway, and is the way most projects do their releases, AFAIK. mike On Mon, Jun 14, 2010 at 10:24 AM, Nicholas L Gallardo <[email protected]>wrote: > > Does everyone else agree that this is the correct approach? > > Yep, this makes the most sense. It's just a service release so I don't see > why we'd need a branch. > > > > > > [image: Inactive hide details for Jesse A Ramos---06/14/2010 10:18:00 > AM---For the 1.1.1 release of Wink, I'm thinking we'll just want]Jesse A > Ramos---06/14/2010 10:18:00 AM---For the 1.1.1 release of Wink, I'm thinking > we'll just want to tag the 1.1 > > > *Jesse A Ramos/Austin/i...@ibmus* > > 06/14/2010 10:17 AM > Please respond to > [email protected] > > > To > > "[email protected]" <[email protected]> > cc > > > Subject > > Merging trunk with 1.0 branch > > For the 1.1.1 release of Wink, I'm thinking we'll just want to tag the 1.1 > branch rather than creating a brand new branch. > > Does everyone else agree that this is the correct approach? > > If so, then we'll need to merge in all the changes that have gone into > trunk since 1.1 was created. Unfortunately, updating 1.1 with relevant > changes is something that we've neglected to do up to now. > > I've created a diff of the 1.1 branch and the trunk and attached it to > JIRA WINK-293 (https://issues.apache.org/jira/browse/WINK-293). Please > take a look at let me know what you think. I think this should just be a > straight push from tunk to the 1.1 branch. I'm not aware of any changes > that should be left out. > > -- Jesse >
