Re: [Freeciv-Dev] Longturn branch
On Sun, Sep 11, 2011 at 11:23:38PM +0200, Matthias Pfafferodt wrote: Am Sonntag, 11. September 2011, 10:45:34 schrieb Michal Mazurek: Would it be possible to create a Longturn branch in the Freeciv repository? Maintaining my diffs would be a lot easier if I could commit them somewhere. A branch would be easier because I could update the code with one svn command. If I were to setup my own repository I would have to apply diffs manually. I do support this; for the old longturn repository I did had a local copy. Could you post the patches? What are the patches? How much would the difference be? The diff is here: http://longturn.org/crap/110911.23.diff The reason i didn't create a local repository is that i want to be able to update the code easily, with svn up. I abandoned the IRC server, since nobody was interested. I hope the autocreate command can be ported to freeciv. It takes a file with a list of player:team:nation: and creates players appropriately. -- Michal Mazurek ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Longturn branch
On 12 September 2011 11:11, Michal Mazurek akf...@jasminek.net wrote: The diff is here: http://longturn.org/crap/110911.23.diff The reason i didn't create a local repository is that i want to be able to update the code easily, with svn up. Well, that doesn't happen without somebody updating branch in repository. Who you expect to maintain such a branch? My first reaction is to oppose another branch to maintain in our repository. Rather, support for longturn features should be integrated to main branches. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Longturn branch
Am Montag, 12. September 2011, 10:11:51 schrieb Michal Mazurek: On Sun, Sep 11, 2011 at 11:23:38PM +0200, Matthias Pfafferodt wrote: Am Sonntag, 11. September 2011, 10:45:34 schrieb Michal Mazurek: Would it be possible to create a Longturn branch in the Freeciv repository? Maintaining my diffs would be a lot easier if I could commit them somewhere. A branch would be easier because I could update the code with one svn command. If I were to setup my own repository I would have to apply diffs manually. I do support this; for the old longturn repository I did had a local copy. Could you post the patches? What are the patches? How much would the difference be? The diff is here: http://longturn.org/crap/110911.23.diff Do you have a version with single patches for the different things you have (like newcomer command, ...)? A year (or two) ago I did split the diff between freeciv and longturn such that it were small pieces. This helps to get it step by step into mainline. Also, you have another way to connect to the database as well as for newcomer. I got from the discussion that this is mainly due to a lua problem. Did you find a solution for it? Because two ways to do one thing is bad. The reason i didn't create a local repository is that i want to be able to update the code easily, with svn up. You could simply set up a git repo from the main repository: git svn clone --trunk=trunk --tags=tags --branches=branches svn://svn.gna.org/svn/freeciv After that you can update master (= trunk on svn) with git fetch and easily rebase your local longturn branches. I use such a git repo as my local copy. So, if you have questions, just ask. I abandoned the IRC server, since nobody was interested. I hope the autocreate command can be ported to freeciv. It takes a file with a list of player:team:nation: and creates players appropriately. In 2.3 (and trunk) a lot of thing are possible with lua. If possible, I would implement this feature in this language as the infrastructure exists (read lua file from console; create player). Matthias (aka syntron) ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Longturn branch
Am Montag, 12. September 2011, 10:19:18 schrieb Marko Lindqvist: On 12 September 2011 11:11, Michal Mazurek akf...@jasminek.net wrote: The diff is here: http://longturn.org/crap/110911.23.diff The reason i didn't create a local repository is that i want to be able to update the code easily, with svn up. Well, that doesn't happen without somebody updating branch in repository. Who you expect to maintain such a branch? I take it that svn misses something like rebase? My first reaction is to oppose another branch to maintain in our repository. Rather, support for longturn features should be integrated to main branches. That is my goal! Matthias (aka syntron) ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Longturn branch
The diff is here: http://longturn.org/crap/110911.23.diff Do you have a version with single patches for the different things you have (like newcomer command, ...)? A year (or two) ago I did split the diff between freeciv and longturn such that it were small pieces. This helps to get it step by step into mainline. No, but if you think any of the features has a chance of integration I'll create separate diffs happily. The reason i didn't create a local repository is that i want to be able to update the code easily, with svn up. You could simply set up a git repo from the main repository: git svn clone --trunk=trunk --tags=tags --branches=branches svn://svn.gna.org/svn/freeciv After that you can update master (= trunk on svn) with git fetch and easily rebase your local longturn branches. I use such a git repo as my local copy. So, if you have questions, just ask. Oh, now that I know it's possible I'll check it out. Right now I'm rather busy, but in a week I'll give it a try. I abandoned the IRC server, since nobody was interested. I hope the autocreate command can be ported to freeciv. It takes a file with a list of player:team:nation: and creates players appropriately. In 2.3 (and trunk) a lot of thing are possible with lua. If possible, I would implement this feature in this language as the infrastructure exists (read lua file from console; create player). If you could write it, I'll test it. If it will work I'll remove the c code. Or if you could just write a hello world and tell me how to run it. LUA has some pieces of code that can cause Bus error on sparc64. LTex 2.3 has started, I invite you to join! -- Michal Mazurek ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Longturn branch
Am Montag, 12. September 2011, 19:35:23 schrieb Michal Mazurek: The diff is here: http://longturn.org/crap/110911.23.diff Do you have a version with single patches for the different things you have (like newcomer command, ...)? A year (or two) ago I did split the diff between freeciv and longturn such that it were small pieces. This helps to get it step by step into mainline. No, but if you think any of the features has a chance of integration I'll create separate diffs happily. Do you have a short list of the changes. Looking at the patch I find: - newcomer command = why not use lua? additional lua code needed (+ lua functions) - function agains sql injection = I think this one can be applied (should go into utility?) - Migrant unit type - commands: autocreate, syncturn, newcomer - auth (lua!) Questions: - why are the displayed player names changed? In 2.3 (and trunk) a lot of thing are possible with lua. If possible, I would implement this feature in this language as the infrastructure exists (read lua file from console; create player). If you could write it, I'll test it. If it will work I'll remove the c code. Or if you could just write a hello world and tell me how to run it. LUA has some pieces of code that can cause Bus error on sparc64. Is the lua error fixed? This would be the first task ... I did a search on google and found this: http://lua-users.org/lists/lua-l/2008-08/msg00044.html ... and added the LUA_USE_APICHECK define to the code if debug=yes|checks is used. Could you please test it? Perhaps there is an error in the lua code? (see https://gna.org/bugs/index.php?18481) LTex 2.3 has started, I invite you to join! I will check the time ... -- Matthias Pfafferodt - http://www.mapfa.de Matthias.Pfafferodt at mapfa.de ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Longturn branch
On Mon, Sep 12, 2011 at 08:52:00PM +0200, Matthias Pfafferodt wrote: No, but if you think any of the features has a chance of integration I'll create separate diffs happily. Do you have a short list of the changes. Looking at the patch I find: - newcomer command = why not use lua? additional lua code needed (+ lua functions) - function agains sql injection = I think this one can be applied (should go into utility?) - Migrant unit type - commands: autocreate, syncturn, newcomer - auth (lua!) Yes, I think this is it. Who created the original graphics? Is it possible to create a graphic for migrants? Somehow my pipe code is not in the source tree, but i sent it to gna patches. To autosave the game every 15 minutes from cron for example. Questions: - why are the displayed player names changed? I'd rather read 'syntron stole x from you' instead of 'some_arbitrary_nation stole x from you'. I found myself often having to lookup who plays as 'some_arbitrary_nation', since they probably play another nation in a different game. In 2.3 (and trunk) a lot of thing are possible with lua. If possible, I would implement this feature in this language as the infrastructure exists (read lua file from console; create player). If you could write it, I'll test it. If it will work I'll remove the c code. Or if you could just write a hello world and tell me how to run it. LUA has some pieces of code that can cause Bus error on sparc64. Is the lua error fixed? This would be the first task ... I did a search on google and found this: http://lua-users.org/lists/lua-l/2008-08/msg00044.html ... and added the LUA_USE_APICHECK define to the code if debug=yes|checks is used. Could you please test it? Perhaps there is an error in the lua code? (see https://gna.org/bugs/index.php?18481) Could you just send me some lua script that i can use, and tell me how to run it? -- Michal Mazurek ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Longturn branch
Would it be possible to create a Longturn branch in the Freeciv repository? Maintaining my diffs would be a lot easier if I could commit them somewhere. A branch would be easier because I could update the code with one svn command. If I were to setup my own repository I would have to apply diffs manually. -- Michal Mazurek ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Longturn branch
Am Sonntag, 11. September 2011, 10:45:34 schrieb Michal Mazurek: Would it be possible to create a Longturn branch in the Freeciv repository? Maintaining my diffs would be a lot easier if I could commit them somewhere. A branch would be easier because I could update the code with one svn command. If I were to setup my own repository I would have to apply diffs manually. I do support this; for the old longturn repository I did had a local copy. Could you post the patches? What are the patches? How much would the difference be? Matthias (aka syntron) ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
