tortoiseSVN - 文件已过期
我在使用 tortoiseSVN 和 Subversion 时遇到问题。过程如下:
- 我在计算机 A 上创建一个新存储库
- 。我将存储库签出到计算机 B 上的工作副本(我们使用对等网络,两台 PC 都装有 Windows Vista)。
- 我将 ASP.NET 网站的文件和目录复制到工作副本中。
- 我添加文件,然后提交它们。到目前为止,一切都很好。
- 我在 PC B 上的工作副本中编辑了一个文件。
- 我提交了该文件,然后问题开始了:
- 首先,tortoiseSVN 无法提交,因为它无法删除存储库中的文件。
- 第二次尝试提交时,tortoiseSVN 表示该文件已过期。
- 我在 PC B 上运行了 tortoiseSVN 更新。成功,没有任何更改。
- 我尝试在 PC B 上运行提交并得到相同的文件过期错误。
在我看来如下:
尽管出现错误,但初始提交已部分成功。因此,当我尝试第二次提交时,该文件已过期。
但是,显然还存在其他问题:这次在 PC A 上检查新的工作副本,显示对文件的更改已提交。然后我可以毫无问题地进行更改并提交它们。请注意,存储库位于 PC A 上。因此 PC A 上的工作副本似乎工作正常。
对等网络似乎也运行良好。
所以我真的不知道该怎么办。我们需要两个人在这个网站上工作,所以我们需要版本控制。
任何帮助表示赞赏。我现在正处于白眼阶段,我真的不知道下一步该尝试什么。
I am having problems with tortoiseSVN and Subversion. Process is as follows:
- I create a new repository on computer A.
- I checkout the repository to a working copy on computer B (we use a peer to peer network, both PCs with Windows Vista).
- I copy files and directories for an ASP.NET website into the working copy.
- I add the files, then commit them. So far, so good.
- I edit a file in the working copy on PC B.
- I commit the file and then the problems begin:
- First, tortoiseSVN fails to commit because it cannot delete a file in the repository.
- A second attempt to commit and tortoiseSVN says that the file is out of date.
- I run a tortoiseSVN update on PC B. Succeeds, with no changes.
- 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.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
这听起来像是树冲突,
This sounds like a tree conflict, which are well described on Resolving Conflicts.
如果您使用
file://
协议,则应注意 TortoiseSVN 不支持:TortoiseSVN 不想支持这种情况的一个原因是,如果一个人升级了他们的 TortoiseSVN,而与他们一起工作的另一个人没有升级,则可能会导致各种问题。
If you are using the
file://
protocol, you should note that TortoiseSVN doesn't support it: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.