tortoiseSVN - file is out of date

I am having problems with tortoiseSVN and Subversion. Process is as follows:

1. I create a new repository on computer A.
2. I checkout the repository to a working copy on computer B (we use a peer to peer network, both PCs with Windows Vista).
3. I copy files and directories for an ASP.NET website into the working copy.
4. I add the files, then commit them. So far, so good.
5. I edit a file in the working copy on PC B.
6. I commit the file and then the problems begin:
7. First, tortoiseSVN fails to commit because it cannot delete a file in the repository.
8. A second attempt to commit and tortoiseSVN says that the file is out of date.
9. I run a tortoiseSVN update on PC B. Succeeds, with no changes.
10. I try to run the commit on PC B and get same file out of date error.

It seems to me as follows:

The initial commit has partially succeeded, despite the error. As a result, the file is out of date when I try to commit a second time.

开发者_如何转开发

However, there is clearly something else wrong: checking out a new working copy, this time on PC A, shows that the changes to the file WERE committed. I can then make changes and commit them without problems. Note that the Repository is on PC A. So working copies on PC A seem to work fine.

The peer to peer network also appears to be working fine.

So I really don't know what to do. We need two people working on this website so we need version control.

Any help appreciated. I am now at the pie eyed stage where I really don't know what to try next.

---

This sounds like a tree conflict, which are well described on Resolving Conflicts.

---

If you are using the file:// protocol, you should note that TortoiseSVN doesn't support it:

Although in theory it is possible to put a FSFS repository on a network share and have multiple users access it using file:// protocol, this is most definitely not recommended. In fact we would strongly discourage it, and do not support such use.

One reason that TortoiseSVN doesn't want to support this scenario is that if one person upgrades their TortoiseSVN and someone they are working with doesn't, it can cause all kinds of problems.