在SVN中合并后我无法提交更改-IcannotcommitchangesaftermergeinSVN

I had a problem with committing changes after merging two branches of my project using TortoiseSVN.

在使用TortoiseSVN合并项目的两个分支后,我遇到了提交更改的问题。

Here are details:

这是详细信息:

I did a merge branch to trunk of project which I am working on.

我做了一个合并分支到我正在研究的项目的主干。

Project includes main repository and libraries joint to main repository as svn external (libraries are also branched) as subdirectory of project.

项目包括与主存储库连接的主存储库和库,作为svn external(库也分支)作为项目的子目录。

When I was trying to commit changes TortoiseSVN said:

当我试图提交更改时,TortoiseSVN说:

Commit A
re all the targets part of the same working copy? 
Unable to lock 'D:\websites\project\lib' 
Please execute the "Cleanup" command.

Of course Cleanup didn't help.

当然,清理并没有帮助。

svn:external keyword for project directory was well defined, also lib folder still contained proper version of libraries (trunk version).

svn:项目目录的外部关键字定义良好,lib文件夹中仍然包含正确版本的库(主干版本)。

Both SVN server and client are in 1.5.x version (TortoiseSVN is 1.5.3.x).

SVN服务器和客户端都是1.5.x版本(TortoiseSVN是1.5.3.x)。

From technical point of view both project and libraries are projects in the same SVN repository.

从技术角度来看,项目和库都是同一SVN存储库中的项目。

Any idea what went wrong?

知道出了什么问题吗?

I had been googling a bit for the solution, but didn't find anything useful, so I tried to commit my changes in two steps:

我一直在谷歌搜索解决方案,但没有找到任何有用的东西,所以我尝试分两步提交我的更改:

1. commit changes from project folder

从项目文件夹提交更改

2. commit changes from libraries folder

从库文件夹提交更改

Which went without any problems.

哪个没有任何问题。

But I am still wondering why I couldn't commit everything in one commit.

但我仍然想知道为什么我不能在一次提交中提交所有内容。

EDITS:

• (After Ken G answer) Fixed version of TortoiseSVN 1.3.x -> 1.5.3.x.

(Ken G回答之后)固定版TortoiseSVN 1.3.x - > 1.5.3.x.

3 个解决方案