Menu
▾
▴
Re: [Rails-devel] Releasing 1.6.1 this weekend?
|
From: <Dr....@t-...> - 2012-01-29 18:06:24
|
Hi Stefan, if i understand you right, there will be: - a branch 1.6.x that should get fixes for "released games and core parts". - a branch master(1.x) that should be available for new developments outside of your work for 2.0 - a branch 2.0 that will be available for testing and merge tests somewhere in the future where you expect someone(might be you or someone else to port the additions we did to the game after 1.5. If thats right, thats ok with me :) (my 2 c for whats it worth till Erik saves my ass again :)) Regards, Martin Von: Stefan Frey <ste...@we...> An: rai...@li... Betreff: Re: [Rails-devel] Releasing 1.6.1 this weekend? Datum: Sun, 29 Jan 2012 18:26:12 +0100 Frederick: Yes I will create 1.6.x after that release. I am happy for everyone who pushes their changes to both branches, however I did not want to make this a requirement. Rails 1.5.x will not be deleted due to Brett asking for keeping all releases re-creatable from the repo. Stefan On 01/29/2012 06:17 PM, Frederick Weld wrote: > Stefan: > No problem, I didn't perceive this as blaming. On top of that, you're > right that some of my commits are prefixed by "fixed..." but relate to > fixes to new (and not yet released) features. > > Having a branch labelled 1.6.x for hotfixes would be what I was > looking for. I didn't merge my fixes to the release branch since I > only saw 1.5.x on the remote and wasn't sure whether I was supposed to > merge into that. So, you will create that 1.6.x branch and remove > 1.5.x? > > -- Frederick > > On Sun, Jan 29, 2012 at 6:05 PM, Stefan Frey wrote: >> Frederick: >> it was not my intention to blame anyone for that: >> >> It is only the fact that simply filtering for "fix" in the short-log window of >> a git-gui is misleading (which shows many more fixes than you refer to below). >> >> Again it is not a blame, I was simply surprised by the number of commits we >> see recently, which is a good and not a bad thing. >> >> The separation is already there, see my previous mail to Martin. I preferred >> to create a new branch for the maintenance of each minor release to avoid >> merging the "bug-fix" branch with the "development" branch after a minor >> release. >> >> Stefan >> >> >> >> On Sunday, January 29, 2012 05:50:52 PM Frederick Weld wrote: >>> Stefan: >>> You're right that almost all work done are new features. But for the >>> separation of features/fixes, I always tried to be very clear in the >>> commits. From my point of view, my bug fix commits are: >>> >>> autosave: 9d832d70a9f91944f1e1d8fba124f97c00f097cd >>> default game options: ee46d990d508904fc6a542f20f8b4c30c53f4203 >>> report window during timewarp: 397883e62ab8aec92b509016b5b37dec1ade89ea >>> >>> In my opinion, the two options would be either 1.6.1 bug-fix-only or >>> 1.7 with full features. (without having a preference for any of them) >>> >>> BTW: If we want to separate bug fix and feature dev more clearly in >>> future, I would propose to use a new/specific branch "release". >>> Hotfixes are merged into both release and master (=feature dev). Then, >>> it would be very easy to quickly make fixes available. (See >>> http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/) >>> >>> -- Frederick >>> >>> ---------------------------------------------------------------------------- >>> -- Try before you buy = See our experts in action! >>> The most comprehensive online learning library for Microsoft developers >>> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, >>> Metro Style Apps, more. Free future releases when you subscribe now! >>> http://p.sf.net/sfu/learndevnow-dev2 >>> _______________________________________________ >>> Rails-devel mailing list >>> Rai...@li... >>> https://lists.sourceforge.net/lists/listinfo/rails-devel >> >> ------------------------------------------------------------------------------ >> Try before you buy = See our experts in action! >> The most comprehensive online learning library for Microsoft developers >> is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, >> Metro Style Apps, more. Free future releases when you subscribe now! >> http://p.sf.net/sfu/learndevnow-dev2 >> _______________________________________________ >> Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > ------------------------------------------------------------------------------ > Try before you buy = See our experts in action! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-dev2 > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ Rails-devel mailing list Rai...@li... https://lists.sourceforge.net/lists/listinfo/rails-devel |
