[aquaria] Is the project still alive?

[Dustin Voss]

That is how distributed version control works. None of us have permission to directly update to the icculous source code — nor should we, unless we work at Bit Blot — so we do our changes locally and send pull requests to Bit Blot (via this mailing list, I suppose).

Bit Blot then goes through our changes, vets them, and integrates them into the main source code. I am not sure how far along they are with that; I believe they have been working on it though.

What we, the contributing community, can do is:

1) Make our branches easy to integrate. That means making them directly off of the default icculous branch or other branches as much as possible. (Andrew Church, I am pointing you out as a bad example here. I have had to untangle a bunch of your patches from each other to use them in my own repo. I have named those cleaned-up branches "*/achurch”.)

2) Set up our own integration repository and a volunteer to integrate all these different patches, much like what Bit Blot is doing. However, this will effectively be a fork of Aquaria, since our volunteer will be making the editorial decisions that, right now, we are leaving to Bit Blot.

We have opted to do #1. I do not think anyone wants to completely fork Aquaria.
 

On Apr 10, 2011, at 2:17 PM, Kav Latiolais wrote:

> That does lead to the interesting question:
> why all the forking? Can we branch inside the main repo? Can we get
> general goodness fixes pushed to the main repo? Seems a shame to have
> all these code bases diverging when there really aren't that many
> contributors.
> 
> On Sun, Apr 10, 2011 at 11:26 AM, Dustin Voss <d_j_v at mac.com> wrote:
>> I’ve got one with a couple of changes. Mostly for gamepad support, and something to help Mac OS X builds.
>> 
>> https://bitbucket.org/_Agent/aquaria
>> 
>> 
>> On Apr 10, 2011, at 11:18 AM, False.Genesis wrote:
>> 
>>> Hi, sure there is!
>>> The repo at icculus.org is the 'official' one, which is indeed sort of inactive, but there is Andrew Church's hg repo at
>>> http://achurch.org/cgi-bin/hg/aquaria that is updated quite often with fixes and other cool stuff,
>>> and I also have a git one at https://github.com/fgenesis/Aquaria based on Andrew Churchs repo.
>>> 
>>> Side note: What about a forum topic with a list of all repos? That could be useful to prevent future dev-chaos, and to have things neatly sorted. I think i'm going to make one tomorrow.
>>> (At least i don't know about other repos - if anyone does, say it)
>>> 
>>> 
>>> Am 10.04.2011 20:01, schrieb Tomasz Makarewicz:
>>>> Hi,
>>>> I have just started looking into Aquaria open-source project. It seems,
>>>> that last change in code was made 9 months ago (16.06.2010)! Also
>>>> 'Things to do' on this page:
>>>> http://blog.wolfire.com/2010/06/Aquaria-goes-open-source seems to be out
>>>> of date. Is there anybody still working on the code? What is current
>>>> list of things to do? Do you need some help from very unskilled guy -
>>>> maby for some boring work?
>>>> Best regards
>>> _______________________________________________
>>> aquaria mailing list
>>> aquaria at icculus.org
>>> http://icculus.org/mailman/listinfo/aquaria
>> 
>> _______________________________________________
>> aquaria mailing list
>> aquaria at icculus.org
>> http://icculus.org/mailman/listinfo/aquaria
>>