0

I've been using several VCS systems and wondered:

Is there any free or inexpensive VCS with ability to lock files instead of constantly merging?

Almost all the open-source VCSs out there support merge... but if you generate 1 too many revisions, there is too much to merge and after while, source code goes crazy trying to deal with all the merges.

Problem: We have a team that generates ~ 100+ changes per day and merging a team of changes leaves us swamped with many, many changes each developer has to commit.

Any ideas for a better solution than merge?

Using HG (Tried GIT, Bazaar, etc.)

buttercup
  • 1,096
  • 16
  • 37

2 Answers2

3

SVN allows you to lock individual files. There's no support for locking whole directories though.

detly
  • 29,332
  • 18
  • 93
  • 152
0

SourceGear has a free source control product as long as it's only used by 1 developer.

www.sourcegear.com

Scottie
  • 11,050
  • 19
  • 68
  • 109
  • If it's only being used by one developer, why would you need locking? – detly Dec 04 '10 at 07:40
  • In case you work from home on your laptop, like I do, as well as an office PC. I can't ever remember which files I've modified. – Scottie Dec 04 '10 at 07:42
  • I've never used it, but CVS is quite popular. – Scottie Dec 04 '10 at 07:44
  • If you're going to go with CVS, you might as well go with SVN :P In my completely unqualified opinion, CVS is really only popular with projects that used it before SVN... – detly Dec 04 '10 at 07:54
  • I need locking because I get around 50+ merges which is impossible to keep track-of. – buttercup Dec 04 '10 at 09:10