From: Stefan F. <ste...@we...> - 2014-08-15 09:26:40
|
<html> <head> </head> <body>Great that you got the explicit permission.<br> <br> When to merge with rails_2_develop mainly depends on your preferences. <br> <br> I am only asking for the following: <br> Please rebase or merge your branch with rails_2_develop so that you are able to fast forward your changes into rails_2_develop. <br> <br> And before doing so, please make sure that it still compiles and runs all save file tests. <br> <br> Main advantage merging frequently is that your development work will be included in the alpha releases. You could even ask for a alpha release after you added some functionality. The build itself is nearly hundred percent automated. <br> <br> I am looking forward to see your progress.<br> <br> Stefan<br> <br> <br> <br><br><div class="gmail_quote"><br> <br> Michael Alexander <out...@gm...>schrieb:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> <div> <div> I did get permission from the author to put it into Rails. </div> <div> <br/> </div> I have most of the Parliament Rounds working. (Nothing yet with the stock market or map). <div> <br/> </div> <div> This work is being done within the "mal_1862" branch. Later today I'm going to re-pull from"rails_2_develop" so I can pick up changes that have gone into there. </div> <div> <br/> </div> <div> Should I on some periodic basis push my changes up into "rails_2_develop", or should I be waiting until I have a lot more working? </div> <div> <br/> </div> <div> Mike <br/> <div> <br/> </div> <div> <br/> </div> </div> </div> ------------------------------------------------------------------------------ _______________________________________________ Rails-devel mailing list Rai...@li...<a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank"> https://lists.sourceforge.net/lists/listinfo/rails-devel</a> </blockquote></div></body> </html> |
From: Michael A. <out...@gm...> - 2014-08-16 14:33:04
|
I'm seeing diffs in the 1880_A test game. For example, the last 5 lines are: EoGFinalRanking : 1. 6213 Dirk Steiner 2. 5867 Karsten Ockenfels 3. 4015 Martin Brumm 4. 3032 Volker Schnell vs. EoGFinalRanking : 1. 4883 Dirk Steiner 2. 4077 Karsten Ockenfels 3. 2570 Martin Brumm 4. 1922 Volker Schnell Is that expected at this point? On Fri, Aug 15, 2014 at 5:26 AM, Stefan Frey <ste...@we...> wrote: > Great that you got the explicit permission. > > When to merge with rails_2_develop mainly depends on your preferences. > > I am only asking for the following: > Please rebase or merge your branch with rails_2_develop so that you are > able to fast forward your changes into rails_2_develop. > > And before doing so, please make sure that it still compiles and runs all > save file tests. > > Main advantage merging frequently is that your development work will be > included in the alpha releases. You could even ask for a alpha release > after you added some functionality. The build itself is nearly hundred > percent automated. > > I am looking forward to see your progress. > > Stefan > > > > > > > Michael Alexander <out...@gm...>schrieb: >> >> I did get permission from the author to put it into Rails. >> >> I have most of the Parliament Rounds working. (Nothing yet with the >> stock market or map). >> >> This work is being done within the "mal_1862" branch. Later today I'm >> going to re-pull from"rails_2_develop" so I can pick up changes that have >> gone into there. >> >> Should I on some periodic basis push my changes up into >> "rails_2_develop", or should I be waiting until I have a lot more working? >> >> Mike >> >> >> >> ------------------------------------------------------------------------------ >> _______________________________________________ Rails-devel mailing list >> Rai...@li... >> https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > > |
From: Stefan F. <ste...@we...> - 2014-08-16 14:40:38
|
Sorry 1880_A is the exception currently, as 1880 still requires some work currently. ;-) On 08/16/2014 04:32 PM, Michael Alexander wrote: > I'm seeing diffs in the 1880_A test game. > > For example, the last 5 lines are: > EoGFinalRanking : > 1. 6213 Dirk Steiner > 2. 5867 Karsten Ockenfels > 3. 4015 Martin Brumm > 4. 3032 Volker Schnell > > vs. > > EoGFinalRanking : > 1. 4883 Dirk Steiner > 2. 4077 Karsten Ockenfels > 3. 2570 Martin Brumm > 4. 1922 Volker Schnell > > Is that expected at this point? > > > On Fri, Aug 15, 2014 at 5:26 AM, Stefan Frey <ste...@we... > <mailto:ste...@we...>> wrote: > > Great that you got the explicit permission. > > When to merge with rails_2_develop mainly depends on your preferences. > > I am only asking for the following: > Please rebase or merge your branch with rails_2_develop so that you > are able to fast forward your changes into rails_2_develop. > > And before doing so, please make sure that it still compiles and > runs all save file tests. > > Main advantage merging frequently is that your development work will > be included in the alpha releases. You could even ask for a alpha > release after you added some functionality. The build itself is > nearly hundred percent automated. > > I am looking forward to see your progress. > > Stefan > > > > > > > Michael Alexander <out...@gm... > <mailto:out...@gm...>>schrieb: > > I did get permission from the author to put it into Rails. > > I have most of the Parliament Rounds working. (Nothing yet with > the stock market or map). > > This work is being done within the "mal_1862" branch. Later > today I'm going to re-pull from"rails_2_develop" so I can pick > up changes that have gone into there. > > Should I on some periodic basis push my changes up into > "rails_2_develop", or should I be waiting until I have a lot > more working? > > Mike > > > ------------------------------------------------------------------------------ > _______________________________________________ Rails-devel > mailing list Rai...@li... > <mailto:Rai...@li...>https://lists.sourceforge.net/lists/listinfo/rails-devel > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > <mailto:Rai...@li...> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > > > > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |
From: Michael A. <out...@gm...> - 2014-08-16 14:42:26
|
Completely fine. I just want to make sure I don't break it. :) On Sat, Aug 16, 2014 at 10:40 AM, Stefan Frey <ste...@we...> wrote: > Sorry 1880_A is the exception currently, as 1880 still requires some > work currently. ;-) > > > On 08/16/2014 04:32 PM, Michael Alexander wrote: > > I'm seeing diffs in the 1880_A test game. > > > > For example, the last 5 lines are: > > > EoGFinalRanking : > > 1. 6213 Dirk Steiner > > 2. 5867 Karsten Ockenfels > > 3. 4015 Martin Brumm > > 4. 3032 Volker Schnell > > > > vs. > > > > EoGFinalRanking : > > 1. 4883 Dirk Steiner > > 2. 4077 Karsten Ockenfels > > 3. 2570 Martin Brumm > > 4. 1922 Volker Schnell > > > > Is that expected at this point? > > > > > > On Fri, Aug 15, 2014 at 5:26 AM, Stefan Frey <ste...@we... > > <mailto:ste...@we...>> wrote: > > > > Great that you got the explicit permission. > > > > When to merge with rails_2_develop mainly depends on your > preferences. > > > > I am only asking for the following: > > Please rebase or merge your branch with rails_2_develop so that you > > are able to fast forward your changes into rails_2_develop. > > > > And before doing so, please make sure that it still compiles and > > runs all save file tests. > > > > Main advantage merging frequently is that your development work will > > be included in the alpha releases. You could even ask for a alpha > > release after you added some functionality. The build itself is > > nearly hundred percent automated. > > > > I am looking forward to see your progress. > > > > Stefan > > > > > > > > > > > > > > Michael Alexander <out...@gm... > > <mailto:out...@gm...>>schrieb: > > > > I did get permission from the author to put it into Rails. > > > > I have most of the Parliament Rounds working. (Nothing yet with > > the stock market or map). > > > > This work is being done within the "mal_1862" branch. Later > > today I'm going to re-pull from"rails_2_develop" so I can pick > > up changes that have gone into there. > > > > Should I on some periodic basis push my changes up into > > "rails_2_develop", or should I be waiting until I have a lot > > more working? > > > > Mike > > > > > > > ------------------------------------------------------------------------------ > > _______________________________________________ Rails-devel > > mailing list Rai...@li... > > <mailto:Rai...@li...> > https://lists.sourceforge.net/lists/listinfo/rails-devel > > <https://lists.sourceforge.net/lists/listinfo/rails-devel> > > > > > > > ------------------------------------------------------------------------------ > > > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > <mailto:Rai...@li...> > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > > > > > > > ------------------------------------------------------------------------------ > > > > > > > > _______________________________________________ > > Rails-devel mailing list > > Rai...@li... > > https://lists.sourceforge.net/lists/listinfo/rails-devel > > > > > ------------------------------------------------------------------------------ > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel > |