Best versioning software for small teams

Hi all,

I'm looking for simple software to eliminate some of the headaches of
versioning, designed for a smallish team. I know of lots of software
like this, but it all seems terribly complex and heavy to implement
considering the small number of features a team our size would actually
need or use. We don't want to lose too much of the flexibility that we
have as a small team (4 developers), but we now often work on the same
project simultaneously (different modules of course), and reintegrating
without crushing anyone else's changes is becoming difficult to keep up
with in a reliable way.

Therefore, here are the main features we're looking for:

1) The ability for different people to simulatenously work on different
modules of the same project, and then seemlessly merge when they see
fit. Obviously, if some of the same files were modified on both sides,
it would make sense to have to manually resolve the conflict, but
that's not an issue.

2) The ability to backup each version that gets delivered, even if
there are pending, non-merged changes that other developers are working
on. We each have a laptop development machine, and very often work at
the customers' site, so we always work on a local copy of the project.
Therefore, it must be possible for one developer to work on one
independant module for any length of time, while other developers
continue making other changes and saving new versions.

3) There must be some way to tap into the system programmatically, so
that we can integrate it with our own backup and version-management
tool. In other words, we need a tool to manage the merging versions,
not documenting changes or anything of that sort.

Thanks in advance!
--
Best regards,
Jonathan Neve
_______________
CopyTiger - advanced database replicator for Interbase/Firebird!
Web : http://www.microtec.fr/copycat/ct
_______________________________________
CopyCat - database replication components for Delphi/C++Builder!
Web : http://www.microtec.fr/copycat/cc
.

Relevant Pages

  • Packaging, dependencies and rates of development
    ... > When you have it ALL in the single distro, ... versioning issues, because the packagers will take care of them. ... And so, once again, we're left with developers having to ...
    (comp.lang.python)
  • Re: Best versioning software for small teams
    ... versioning, ... flexibility that we have as a small team (4 developers), ... The ability for different people to simulatenously work on ... that we can integrate it with our own backup and version-management ...
    (borland.public.delphi.thirdpartytools.general)
  • Re: Best versioning software for small teams
    ... I'm looking for simple software to eliminate some of the headaches of ... versioning, designed for a smallish team. ... non-merged changes that other developers are working ...
    (borland.public.delphi.thirdpartytools.general)
  • Re: Men Are Smarter Than Women
    ... "Men are more intelligent than women, claims new study By BEN CLERKIN & ... FIONA MACRAE Last updated at 13:38pm on 14th September 2006 ... ability and historically men have solved different types of problems than ... the developers. ...
    (soc.retirement)
  • Re: Using privilied ports <1024 with Java
    ... are to give customers who ... >> the ability to grant application folks the ability to run customized ... The VMS Developers had an illustration they passed around amongst ... DeeDee, don't press that button! ...
    (comp.unix.solaris)