[Last Call] Learn how to a build a cloud-first strategyRegister Now

x
  • Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 794
  • Last Modified:

SVN Tortoise - Concurrent check-in

We are using SVN Tortoise to maintain source code. If one file is modified by one user (user A) and checked-in, another user (user B) may be working on the file at the same time. While user B check-in the same file it does not show any conflict and able to check-in. This causes the user A made changes are gone away. How to resolve this problem?

 Any help is much appreciated. Thanks.
0
Easwaran Paramasivam
Asked:
Easwaran Paramasivam
1 Solution
 
dgofmanCommented:
Hi,
The differences between Perforce and SVN, users doesn't know about any active users check-out till someone will check in to the server. All information about a file SVN keeps in .svn directory.  You can download SVN monitor tool what will notify when file is modified
0
 
MRSchexnayderCommented:
The problem here isn't the tool you are using to development and manage your code. SCM Tools like Subversion, Git, Mercurial, and CVS all allow users to get a complete copy of a projects code at any time while not keeping track of where changes are being made (other copies) until those changes are 'checked-in' or 'committed' to the source. Therein lies the problem.

I suggest you adopt a good development branching and merging strategy for your development teams if they are large enough that interpersonal communications are an issue, which is sounds like they are.  

Encourage each of your developers to update their local copies and branches frequently to pick up others changes and whenever possible, work in an isolated branch. Working in isolated branches ensure that you never loose code. Old branches can be pruned easily.  Also, make sure changes in a branches parent are merged into the branch BEFORE merging back to the parent. This will help isolate any conflicts on the branch instead of the parent which can have some significant consequences.

What I've put here is just a few small things you can do. Seek advice from a qualified Software Configuration Manager on the topic. You'll be glad you did.
0
 
Easwaran ParamasivamAuthor Commented:
Thanks.
0

Featured Post

Technology Partners: We Want Your Opinion!

We value your feedback.

Take our survey and automatically be enter to win anyone of the following:
Yeti Cooler, Amazon eGift Card, and Movie eGift Card!

Tackle projects and never again get stuck behind a technical roadblock.
Join Now