简体繁体 English

TortoiseSVN 将分支移动到主干

[英]TortoiseSVN moving a branch to trunk

原文 2021-05-19 08:29:12 3 1 svn/ merge/ tortoisesvn/ svn-merge

I messed up and did the main development on a branch, the trunk is actually empty in the repository and I'm trying to move the branch to the trunk.我搞砸了并在一个分支上进行了主要开发，主干实际上在存储库中是空的，我正试图将分支移动到主干。

I'm not sure how this is supposed to be done the right way and it gets more complicated because in my project I also have a lot of externals.我不确定这应该如何以正确的方式完成并且它变得更加复杂，因为在我的项目中我也有很多外部。

I'm using TortoiseSVN and I tried to switch over to the Trunk and it deleted all my files (makes sense since the trunk is empty).我正在使用 TortoiseSVN，我试图切换到主干，它删除了我所有的文件（因为主干是空的，所以很有意义）。 Then I tried to do a merge from the branch to the trunk but I get the message "Cannot merge automatically while ignoring mergeinfo" .然后我尝试从分支合并到主干，但我收到消息"Cannot merge automatically while ignoring mergeinfo" 。

What is the proper way to fix this "mess", all I want is to move the branch I have been working on all the time to the trunk.解决这个“混乱”的正确方法是什么，我想要的只是将我一直在处理的分支移动到主干。

1 个解决方案

I solved it.我解决了。

In the repository browser I simply just marked all the files and folders inside my branch and moved them (drag & drop) into the trunk folder (in the repository).在存储库浏览器中，我只是标记了我的分支中的所有文件和文件夹并将它们（拖放）移动到主干文件夹（在存储库中）。

Then I just did an update in my working folder (I had already done the switch from branch to trunk before).然后我只是在我的工作文件夹中进行了更新（我之前已经完成了从分支到主干的切换）。

It was that simple!就是这么简单！

EDIT编辑
I think the problem was that my "branch" copy was not created with the Branch/tag command.我认为问题在于我的“分支”副本不是使用 Branch/tag 命令创建的。 It was a check out directly from repository branches.这是直接从存储库分支签出。