[aquaria] Gamepad improvements

Andrew Church achurch+aquaria at achurch.org
Thu Aug 5 03:54:29 EDT 2010

>> You can't pull branches from unrelated repositories -- you'll have to
>> apply the patches manually.
>You can, you just have to force it... and then you'll have two
>branches within the same repo that you can merge.

True, but merging unrelated branches for a project the size of Aquaria
may be a bit daunting.  (Perhaps not at the moment, since there haven't
been too many commits on icculus.org, but that was my thinking.)

>What I don't undersand is why you both didn't start from the same repo.

I didn't consider it feasible to use a clone of icculus.org, for various
and sundry reasons but mostly due to the volume of changes I've been

$ hg diff --git -r icculus:tip | wc -l

  --Andrew Church
    achurch at achurch.org

More information about the aquaria mailing list