On Sat, Nov 15, 2008 at 12:10 PM, Brion Vibber <brion(a)wikimedia.org> wrote:
The SVN server was updated to 1.5 a while ago, which
is apparently a
little handier at branch merging, but branching still is kind of awkward
in SVN. Any good recommendations on SVN-friendly DVCSs? I know some
folks use SVK or a GIT-SVN bridge for doing various local development,
but how easy is it to share a development branch among multiple
developers over time this way?
I'm a big fan of git, having set it up recently (also ask Aryeh/Simetrical).
Branching and tagging works nicely and natively - git encourages,
rather than tolerates the non-linear development model, and has some
nice tools to keep branches in-sync with trunk (unlike svn, which
requires devil invocations and black magic).
In terms of architecture, we can have a central server which holds
trunk, all of the development branches, and so on. Development
branches can be pushed to the central server, and pulled by people
wanting to use them. Switching between branches is as simple as 'git
checkout branch-name'. We can, of course, have separate central
servers if we wish (since that's kinda the point of a DVCS).
--
Andrew Garrett