New development organisation To make development easier, we decided to give only a few person direct access do this repository:
Because I could not get in contact with everyone, if you think you should (not) be on this list, send me complain- or hatemails. In order to give you access, you need to create an account on github (free) where you give your name, email and ssh-key. If you did so, you can start commiting, branching, forking etc. edit: you also need to tell me your username, so I can add you as a contributor
If you don't have access to the repo, you can still develop. All you need it is a public git repository. Clone the developmen repo, do your stuff, and then tell one of us to merge it. You ca use github for hosting your own repo, it also have a nice interface to inform us about your effort. Or if you don't like github, you can use any hosting service or you can host it yourself.
new repository organisation I only moved the engine there. This does not include any stuff which used to live in Lobby/. As mentioned above, the svn server will be shut down sometimes so you should move your code somewhere else (not too soon, you don't need to rush anything). This also applies to MapConf, MapDesigner and Upspring.
In order to shrink the size of the repository, I needed to remove some big files and directories out of the history. This means that all the branches are lost. Most of them had been old and unmaintained, but caiinterface and gmltest had been actively used. hoijui said that it is no big deal for him to simply exporting a patch from svn and reapplying it to git, and hopefully it won't be any problem for the gml branch too.
would it be possible to convert the caiinterface branch to git (independently from the trunk git), preserving revision history, and later merge the two in git? i guess this question can be simplifyed into: can git merge branches, which have no common ancector? I would have a guess that it is possible, does anyone know it? It would be the optimal solution in my eyes. If it is not possible, we will have to do a diff, as Auswaschbar suggested.
ohloh is really bad at importing git repos tho, it fails every other time and you have to request manual intervention (at least that was the situation when i last bothered to ask for manual update for the SL enlistment)
Joined: 16 Aug 2004, 03:36 Location: The Steward's Realm
How are you arranging for people to commit? Does every dev have their own branch that they push to, with a master branch that a change is integrated into once it's verified? Or is there some other way?
Users browsing this forum: No registered users and 0 guests
You cannot post new topics in this forum You cannot reply to topics in this forum You cannot edit your posts in this forum You cannot delete your posts in this forum You cannot post attachments in this forum