[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Multiple users modifying the same file from the Repo Browser

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 20 Aug 2011 10:53:35 +0200

On 19.08.2011 16:45, Todd Nelson wrote:
> I know the new functionality in the repo browser that will allow a
> user to modify a file directly will get used very heavily in our
> company.
>
> One scenario that I can see happening is that more that one user would
> be modifying the same file. If two users are editing the same file,
> the first person will be able to commit their changes with no issues.
> When the second user attempts to commit their changes, it fails with
> the following error dialog:
>
> Command: Commit
> Modified: C:\Tmp\trunk.svn003.tmp\Correct_Name.txt
> Error: Commit failed (details follow):
> Error: File or directory 'Correct_Name.txt' is out of date; try
> updating
> Error: resource out of date; try updating
> Completed!:
>
> When the user clicks OK on the dialog box, and second dialog is
> displayed and tells the user they should try updating because the
> resource is out of date. It asks if TortoiseSVN should try updating
> the working copy and then retry. When the update button is clicked,
> all dialogs disappear and the users changes are lost and no commit is
> ever made.
>
> What is the expected behavior for this scenario?
> Thanks.

Tried to reproduce this, but after updating, the commit dialog is
reopened again automatically for me and I then can commit.

but of course, the best way to deal with this is that if you want to use
the direct-edit feature from the repository browser, you should either
set the svn:needs-lock property on your files, or improve the
communication in your team :)

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2826061
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-20 10:54:15 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.