Are their any better versioning systems than CVS? Free or otherwise? Something that does merging (allows concurrent editting), and doesn''t break when someone checks-out at the same time somelese checks-in?

Subversion?

--
AnkhSVN - A Visual Studio .NET Addin for the Subversion version control system.
[Project site] [Blog] [RSS] [Browse the source] [IRC channel]

Oh, you might also want to take a look at Sourcegear Vault, which I haven''t tried(it costs $$$), but have heard a lot of nice things about.

--
AnkhSVN - A Visual Studio .NET Addin for the Subversion version control system.
[Project site] [Blog] [RSS] [Browse the source] [IRC channel]

As Ardild mentioned there is Subversion which I have heard good things about but have not personally messed with it... So far CVS has met my needs well enough. I know CVS supports concurrent editting... perhaps you''ve ran in to a bug or two?

Anyway,
Luck
Feral

What is it that the Linux kernel uses? Bitkeeper? I think that''s it.

Whatever it is, I hear Linus likes it a lot better than CVS.

He prefer it because it matches the linux kernel development model a lot closer than CVS does. In the linux kernel, pretty much all patches are sifted through a very small handful of people at the top of the pecking order. Bitkeeper supports that model pretty well.

This thread on the subversion mailing list covers some of this stuff: http://www.contactor.se/~dast/svn/archive-2003-02/1599.shtml

--
AnkhSVN - A Visual Studio .NET Addin for the Subversion version control system.
[Project site] [Blog] [RSS] [Browse the source] [IRC channel]

Aegis and Arch are other (Free) CVS replacements.

I always though subversion was an implementation of CVS... So it''s something completely different? (though along the same lines, obviously...)

The Artist Formerly Known as CmndrM

http://chaos.webhop.org

Subversion is intended as a replacement for CVS; in many ways it''s similar. But it isn''t an implementation of CVS. The commandset and featureset are different.

---

How appropriate. You fight like a cow.

Rational (Well, now IBM) Clearcase is the best I''ve ever used.

You''ve gotta pay through the nose for it, though.