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

[Frederick W. <fre...@go...>]

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