CODEWITHSUNDEEP
svnrepository
Dan
Dan

Reputation: 1083

Using SVN with multiple users

We are currently using SVN to handle our code. However, sometimes we all code all at once.

For example 3 people check out the same project. User 1 gets something done and goes to check it in. How can Users 2 and 3 get the update without losing their current work? We've tried the update command but usually yields some errors.

Should we be using something other than SVN?

I am using eclipse's svn repository.

Upvotes: 2

Views: 4035

Answers (3)

duffymo
duffymo

Reputation: 309008

You could try Git, but I doubt that the problem is the source code management software.

Which client are you using? Update shouldn't be yielding errors. Developers need to learn how to branch, update, merge, and commit code. It's not always easy, but it's necessary.

A few rules to follow:

  1. Check in early and often. The longer you wait to check in, the more likely collisions and merges will be.
  2. Get used to updating frequently.
  3. Always update before you commit.

Git can make merges easier, but it doesn't eliminate them.

Upvotes: 0

favoretti
favoretti

Reputation: 30207

If it yields errors it means you made incompatible changes to the same lines of code, which leads to merge conflicts. Whatever VCS you'll use you'll have the same issues, should you be patching the same piece of code in incompatible ways.

VCS doesn't solve your problems with merging always. You need some collaboration rules as to who's working on which part of code and that will solve the merging issues mostly.

Practically, if you experience a merge conflict, you need to resolve it by hand, commit back and let other users update their working copy.

Upvotes: 0

Chris
Chris

Reputation: 3519

Subversion is designed exactly for what you're doing. However, your questions are covered by a basic understanding of how Subversion works. I recommend reading Chapters 1 and 2 of the svn book.

Also, the errors you're seeing on updates are probably conflicts, which are covered in the book.

Upvotes: 3

Related Questions