SVN Tortoise - Concurrent check-in

Posted on 2011-10-31
Last Modified: 2013-12-17
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.
Question by:Easwaran Paramasivam
    LVL 29

    Expert Comment

    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
    LVL 2

    Accepted Solution

    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.
    LVL 16

    Author Closing Comment

    by:Easwaran Paramasivam

    Featured Post

    Do You Know the 4 Main Threat Actor Types?

    Do you know the main threat actor types? Most attackers fall into one of four categories, each with their own favored tactics, techniques, and procedures.

    Join & Write a Comment

    Suggested Solutions

    If your app took Google’s lash recently, here are the 5 most likely reasons.
    The article will include the best Data Recovery Tools along with their Features, Capabilities, and their Download Links. Hope you’ll enjoy it and will choose the one as required by you.
    This tutorial covers a step-by-step guide to install VisualVM launcher in eclipse.
    XMind Plus helps organize all details/aspects of any project from large to small in an orderly and concise manner. If you are working on a complex project, use this micro tutorial to show you how to make a basic flow chart. The software is free when…

    733 members asked questions and received personalized solutions in the past 7 days.

    Join the community of 500,000 technology professionals and ask your questions.

    Join & Ask a Question

    Need Help in Real-Time?

    Connect with top rated Experts

    19 Experts available now in Live!

    Get 1:1 Help Now