Re: [Rails-devel] Releasing 1.6.1 this weekend?

[Stefan F. <ste...@we...>]

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