On Tue, 12 Oct 2010 at 21:13:58 +0100, Tim Angus wrote: > On Fri, 8 Oct 2010 11:58:45 -0500 Brandon wrote: > > I think everyone one of us has our own fork of ioquake3 by now :) > > Perhaps we should be encouraging this then. If we move to some DVCS and > have an ioquake3-experimental repository with more committers, then > cherry pick changesets from this to pull back into the main repository > if they get enough review and testing on the experimental one.
I already have a git-svn conversion of ioquake3 svn which I've been using to pick through the changes applied by a couple of forks (OpenArena and ioUrbanTerror): I've been using this as a basis for the patches I submitted to Bugzilla, because I find it much easier to keep track of branches like that. <http://git.debian.org/?p=users/smcv/ioquake3-upstream.git> An optimal conversion to git would also require a list of committers' usernames mapped to the name and optional email address under which they should appear in the git history. I haven't used Mercurial myself, but I'm sure it's similar. The version of ioquake3 that recently entered Debian (somewhat modified for Debian policy reasons and to be able to play OpenArena from the same engine binary) is also maintained in git. After the big leap of using a DVCS for the stable branch, branching and cherry-picking become much easier, and it also becomes much easier for interested contributors to maintain either long-lived forks, or (preferably) short-lived feature branches that get merged: you don't necessarily need a centralized "experimental" branch, since any individual contributor can maintain their own personal branch or branches. The approach we use in projects related to Telepathy is to have a fairly large number of people who're technically able to commit, but also have a policy that nothing is committed to the official repository until it's had some positive peer-review on Bugzilla or IRC (enforced with social pressure rather than technical restrictions). Everyone keeps their own experimental code in a series of branches in their personal clone of the repository, for instance: http://git.collabora.co.uk/?p=telepathy-glib.git The main repository, with the development branch, and various stable branches named after the release that started them http://git.collabora.co.uk/?p=user/smcv/telepathy-glib-smcv.git My personal clone of that repository, with all my work-in-progress stuff added http://cgit.freedesktop.org/~sjokkis/telepathy-glib Another contributor's clone of the repository on a different server Regards, S _______________________________________________ ioquake3 mailing list [email protected] http://lists.ioquake.org/listinfo.cgi/ioquake3-ioquake.org By sending this message I agree to love ioquake3 and libsdl.
