Hi KG,
I am not sure where Imago got the branch he is working on now, I thought that it also came from SVN as did the one I have for R7.
The reason I selected Imago's R8 branch is because he and YP have put a lot of effort into getting bots up and running in there, in addition to resurrection many of the Club server features. I also did some work on the Club features, and had an ACSS compatible version ready for us to test in 2014, but we didn't get enough testers to try it out, so it died on the table.
I've been through a bunch of it, and I'd encourage anyone who wants to take a look at my changes (and Imago, YP, Turkey, Spunky, and stuff from others) to do so.
I also have beta steam keys to hand out by the bucket full, so as I get closer to a release there will be a full on beta period and many bugs will be fixed in the process. Wasp has been a big help in this area as well, he also is familiar with the projects that are underway at AZ.
My original plan was to do as you suggest, start with R7 and bring AZ changes into it, but I quickly ran into problems dissecting changes from code formatting, and I was making a tremendous amount of bugs in the process. In the end, this was the cleanest way to get the active development branch (which is AZ's branch right now) fitted with FAO security so we can move forward, and still leave the door open for Club and Bots in the future.
I could definitely use your help here, if you find the time to take a look. Right now, the R8 branch from AZ is the head:
https://github.com/FreeAllegiance/Allegiance
We could merge that back into yours to get the full history, if Imago and YP are up for that. They would need to take my changes, and then baseless merge them back to you. I have no idea if that would preserve the changesets back to you though.
Thanks,
-BT