Menu
▾
▴
rails-devel
|
From: <ste...@we...> - 2012-01-28 13:07:20
|
All: as I have been pretty busy and the recent commits of Erik require branching the master for a 1.6.x release series, the release of 1.6.1 got delayed: Hope do get it done until Monday latest. The upgrade to OpenSUSE 12.1 today does not help either, as it requires installing Eclipse afresh (which is not part of the suse repos unfortunately). Due to the upgrade I also pushed my current local Rails 2.0 branch, which still does not compile, however it is close (only 32 errors remaining, down from around 600 at top). So stay tuned for more updates in the not too distant future. Stefan -----Ursprüngliche Nachricht----- Von: "Stefan Frey" <ste...@we...> Gesendet: Jan 20, 2012 11:59:14 AM An: "Development list for Rails: an 18xx game" <rai...@li...> Betreff: [Rails-devel] Releasing 1.6.1 this weekend? All: I plan to release 1.6.1. at the end of this weekend, as there are quite a few of Frederick changes are piling up. So keep last-minute fixes and changes rolling in ... My intention is to update the 2.0 branch with my current local repo this or next weekend latest. Lots of stuff changed, so I hope to present something soon that is worth of feedback. Stefan ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! 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-d2d _______________________________________________ Rails-devel mailing list Rai...@li... https://lists.sourceforge.net/lists/listinfo/rails-devel |
|
From: <Ste...@dh...> - 2012-01-29 16:33:37
|
All: Another follow up before I release. Originally I intended to restrict the maintenance releases to bug fixes only. Reason was that users should expect to be a maintenance release to be more stable than any one before. I deviated a little from this by releasing the background maps in between, however they were optional only. However there are several issues now: * To my surprise there has been a burst of the commit frequency to rails 1.x since I announced rails 2.0. So there are much more commits as expected and due to my focus on the 2.0 branch I have not followed them that closely. * There have been only one or two clear bug-fixes since 1.6.0, so releasing only those is possible. * Reading some commit statements sometimes it is likely that the commit contains both improvement and bug fix. So my Question is: -> Continue as before and release 1.6.1 with only some few bug fixes. -> Go back to the old style: Release everything and ignore the intention of maintenance releases. Stefan Remark: Unfortunately I forgot to push the v1.6.0 tag, so one has to go back to the date 23/12/2011 or search for 1.6.0 in the commit annotations. On Saturday, January 28, 2012 02:07:14 PM ste...@we... wrote: > All: > as I have been pretty busy and the recent commits of Erik require branching > the master for a 1.6.x release series, the release of 1.6.1 got delayed: > Hope do get it done until Monday latest. > > The upgrade to OpenSUSE 12.1 today does not help either, as it requires > installing Eclipse afresh (which is not part of the suse repos > unfortunately). > > Due to the upgrade I also pushed my current local Rails 2.0 branch, which > still does not compile, however it is close (only 32 errors remaining, down > from around 600 at top). So stay tuned for more updates in the not too > distant future. > > Stefan > > > -----Ursprüngliche Nachricht----- > Von: "Stefan Frey" <ste...@we...> > Gesendet: Jan 20, 2012 11:59:14 AM > An: "Development list for Rails: an 18xx game" > <rai...@li...> Betreff: [Rails-devel] Releasing 1.6.1 > this weekend? > > All: > I plan to release 1.6.1. at the end of this weekend, as there are quite a > few of Frederick changes are piling up. > So keep last-minute fixes and changes rolling in ... > > My intention is to update the 2.0 branch with my current local repo this or > next weekend latest. Lots of stuff changed, so I hope to present something > soon that is worth of feedback. > > Stefan > > ---------------------------------------------------------------------------- > -- Keep Your Developer Skills Current with LearnDevNow! > 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-d2d > _______________________________________________ > 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 |
|
From: <Dr....@t-...> - 2012-01-29 16:44:17
|
Hi Stefan, 1:) Stefan your email adress is way of :) 2) i would love to see a maintenance branch, a development branch based on the 2.0 as fast as possible and in the mean time a development branch based on the latest 1.6. So lets keep 1.6.x as maint 1.x as development and of course 2.x as major Release. Von: StefanFrey@dhcppc0 An: "Development list for Rails: an 18xx game" <rai...@li...> Betreff: Re: [Rails-devel] Releasing 1.6.1 this weekend? Datum: Sun, 29 Jan 2012 17:33:30 +0100 All: Another follow up before I release. Originally I intended to restrict the maintenance releases to bug fixes only. Reason was that users should expect to be a maintenance release to be more stable than any one before. I deviated a little from this by releasing the background maps in between, however they were optional only. However there are several issues now: * To my surprise there has been a burst of the commit frequency to rails 1.x since I announced rails 2.0. So there are much more commits as expected and due to my focus on the 2.0 branch I have not followed them that closely. * There have been only one or two clear bug-fixes since 1.6.0, so releasing only those is possible. * Reading some commit statements sometimes it is likely that the commit contains both improvement and bug fix. So my Question is: -> Continue as before and release 1.6.1 with only some few bug fixes. -> Go back to the old style: Release everything and ignore the intention of maintenance releases. Stefan Remark: Unfortunately I forgot to push the v1.6.0 tag, so one has to go back to the date 23/12/2011 or search for 1.6.0 in the commit annotations. On Saturday, January 28, 2012 02:07:14 PM ste...@we... wrote: > All: > as I have been pretty busy and the recent commits of Erik require branching > the master for a 1.6.x release series, the release of 1.6.1 got delayed: > Hope do get it done until Monday latest. > > The upgrade to OpenSUSE 12.1 today does not help either, as it requires > installing Eclipse afresh (which is not part of the suse repos > unfortunately). > > Due to the upgrade I also pushed my current local Rails 2.0 branch, which > still does not compile, however it is close (only 32 errors remaining, down > from around 600 at top). So stay tuned for more updates in the not too > distant future. > > Stefan > > > -----Ursprüngliche Nachricht----- > Von: "Stefan Frey" > Gesendet: Jan 20, 2012 11:59:14 AM > An: "Development list for Rails: an 18xx game" > Betreff: [Rails-devel] Releasing 1.6.1 > this weekend? > > All: > I plan to release 1.6.1. at the end of this weekend, as there are quite a > few of Frederick changes are piling up. > So keep last-minute fixes and changes rolling in ... > > My intention is to update the 2.0 branch with my current local repo this or > next weekend latest. Lots of stuff changed, so I hope to present something > soon that is worth of feedback. > > Stefan > > ---------------------------------------------------------------------------- > -- Keep Your Developer Skills Current with LearnDevNow! > 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-d2d > _______________________________________________ > 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 |
|
From: Stefan F. <ste...@we...> - 2012-01-29 16:53:55
|
Martin, see answers below. Stefan On Sunday, January 29, 2012 05:44:06 PM Dr....@t-... wrote: > Hi Stefan, > > 1:) Stefan your email adress is way of :) Thx, some side-effect from the recent system update. > > 2) i would love to see a maintenance branch, a development branch > based on the 2.0 as fast as possible and in the mean time a > development branch based on the latest 1.6. In principle that was the setup for rails 1.5.x: master => development branch for 1.x rails2.0 => development branch for 2.0 rails1.5.x => maintenance branch for 1.5.x What I did as release manager is to pick the bug-fixes from master into rails1.5.x and then releasing from there. This process is even documented our wiki, see http://sourceforge.net/apps/mediawiki/rails/index.php?title=Release_Management (Reminds me that nearly all steps of the last section is automated already and I should update the walk-through accordingly.) > > So lets keep 1.6.x as maint 1.x as development and of course 2.x as > major Release. Do you vote for releasing all changes (including those for 1880) now as part of 1.6.x or keep them in development only and release them at 1.7. only? > > Von: StefanFrey@dhcppc0 > An: "Development list for Rails: an 18xx game" > <rai...@li...> > Betreff: Re: [Rails-devel] Releasing 1.6.1 this weekend? > Datum: Sun, 29 Jan 2012 17:33:30 +0100 > > All: > Another follow up before I release. > > Originally I intended to restrict the maintenance releases to bug > fixes only. > Reason was that users should expect to be a maintenance release to be > more stable than any one before. I deviated a little from this by > releasing > the background maps in between, however they were optional only. > > However there are several issues now: > > * To my surprise there has been a burst of the commit frequency to > rails 1.x > since I announced rails 2.0. So there are much more commits as > expected and > due to my focus on the 2.0 branch I have not followed them that > closely. > > * There have been only one or two clear bug-fixes since 1.6.0, so > releasing > only those is possible. > > * Reading some commit statements sometimes it is likely that the > commit > contains both improvement and bug fix. > > So my Question is: > > -> Continue as before and release 1.6.1 with only some few bug fixes. > > -> Go back to the old style: Release everything and ignore the > intention > of maintenance releases. > > Stefan > > Remark: Unfortunately I forgot to push the v1.6.0 tag, so one has to > go back > to the date 23/12/2011 or search for 1.6.0 in the commit annotations. > > On Saturday, January 28, 2012 02:07:14 PM ste...@we... wrote: > > All: > > as I have been pretty busy and the recent commits of Erik require > > branching > > > the master for a 1.6.x release series, the release of 1.6.1 got > > delayed: > > Hope do get it done until Monday latest. > > > > The upgrade to OpenSUSE 12.1 today does not help either, as it > > requires > > > installing Eclipse afresh (which is not part of the suse repos > > unfortunately). > > > > Due to the upgrade I also pushed my current local Rails 2.0 branch, > > which > > > still does not compile, however it is close (only 32 errors > > remaining, down > > > from around 600 at top). So stay tuned for more updates in the not > > too > > > distant future. > > > > Stefan > > > > > > -----Ursprüngliche Nachricht----- > > Von: "Stefan Frey" > > Gesendet: Jan 20, 2012 11:59:14 AM > > An: "Development list for Rails: an 18xx game" > > > > Betreff: [Rails-devel] Releasing 1.6.1 > > > > this weekend? > > > > All: > > I plan to release 1.6.1. at the end of this weekend, as there are > > quite a > > > few of Frederick changes are piling up. > > So keep last-minute fixes and changes rolling in ... > > > > My intention is to update the 2.0 branch with my current local repo > > this or > > > next weekend latest. Lots of stuff changed, so I hope to present > > something > > > soon that is worth of feedback. > > > > Stefan > > ---------------------------------------------------------------------------- > > -- Keep Your Developer Skills Current with LearnDevNow! > > 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-d2d > > _______________________________________________ > > 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 |
|
From: Frederick W. <fre...@go...> - 2012-01-29 16:50:59
|
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 |
|
From: Stefan F. <ste...@we...> - 2012-01-29 17:05:23
|
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 |
|
From: Frederick W. <fre...@go...> - 2012-01-29 17:17:54
|
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 <ste...@we...> 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 |
|
From: Stefan F. <ste...@we...> - 2012-01-29 17:26:20
|
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<ste...@we...> 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 |
|
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 |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X