David Everly spake unto us the following wisdom:
> On Mon, Feb 27, 2006 at 01:22:05PM -0500, Ethan Blanton wrote:
> > Evan Schoenberg spake unto us the following wisdom:
> > > On Feb 26, 2006, at 4:31 PM, Ethan Blanton wrote:
> > > > once to the marginally better svn
> > >=20
> > > I would argue that subversion is significantly better than cvs, not =
> > > 'marginally better' (though your point remains).
> > In many important areas it's not an improvement, which is why I make
> > this claim. It doesn't really fix branching and merging to speak of
> > (sure, branches are cheaper, but merges remain much more painful than
> > most distributed VCSs), and it doesn't help third-party developers
> > work with our sources beyond what CVS provides.
> My only significant experience is with CVS, Subversion, and ClearCase.
> So I'm curious to know of a tool that fixes these issues to your
> satisfaction, as I would be interested to read up on how it (and a
> distributed VCS) should work.
OpenCM (http://www.opencm.org/), a non-distributed VCS, actually,
handles branching and merging the best of anything I've seen. It is
unfortunately not a reasonable candidate for Gaim development as it
has performance issues with large-ish repositories, isn't quite
finished, and development seems to be dead.
Darcs (http://abridgegame.org/darcs/) basically abstracts branching
and merging to the point that they require no different developer
concerns from a typical update. One could conversely consider that
updates are sufficiently abstract to handle branching and merging.
Monotone (http://www.venge.net/monotone/) is my current favorite in
the distributed VCS arena, but I do not like its current merging
mechanism. It is, however, an interesting place to look for the
general lay of what I consider a good distributed VCS. You will find
many things in common with git (http://git.cz/) and cogito
(http://www.kernel.org/pub/software/scm/cogito/), the former of which
I understand was influenced by monotone's design.
I think there's some information about all of this in the wiki.
The laws that forbid the carrying of arms are laws [that have no remedy
for evils]. They disarm only those who are neither inclined nor
determined to commit crimes.
-- Cesare Beccaria, "On Crimes and Punishments", 1764