Stefan,
Maybe it's a flaw in the process that I am using. Here are the steps
that I am taking to simulate to users editing the same text file:
1. Open two instances of the repo-browser and right-click on the same
file and choose Edit
2. Make changes in both instances of the open file.
3. Close the editor for instance 1 of the file. This will close the
file give me the commit dialog and the commit will succeed.
4. Close the editor for instance 2 of the file. This will close the
file and give me the commit dialog. The commit will fail with the
following message:
Command: Commit
Modified: C:\Tmp\trunk.svn00b.tmp\Another_File2.txt
Error: Commit failed (details follow):
Error: File or directory 'Another_File2.txt' is out of date; try
updating
Error: resource out of date; try updating
Completed!:
5. Click OK and the "Command failed - Updated needed dialog is now
displayed, with two options Update and Cancel. Neither one of those
options will re-option file. The only way to commit the changes is to
find the temporary working copy in C:/Tmp and make the appropriate
changes and attempt the commit again.
I agree that added the needs-lock property would eliminate the issue
from happening in the first place, but I can guarantee we will have
users running into this scenario.
Thanks again for all your help.
On Aug 20, 3:53 am, Stefan Küng <tortoise..._at_gmail.com> wrote:
> 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&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2827629
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-22 17:21:06 CEST