Mercurial-转换错误-无法转换合并提交 [英] Mercurial - Convert error - unable to convert merge commit

问题描述

我有一个巨大的存储库，其中包含以下布局的许多子文件夹:

I have a huge repository with many subfolders in the following layout:

MainRepo
├── Folder1
├── Folder2
├── Folder3
├── Folder4
└── Folder5

我正在尝试从文件夹Folder1, Folder2 and Folder3创建另一个存储库.

I'm trying to create another repo from folders Folder1, Folder2 and Folder3.

为此，我创建了要在转换中使用的文件映射，如下所示:

To do that I created the filemap to use in convert like this:

include Folder1
include Folder2
include Folder3
rename .

但是当我尝试使用以下方法来转换存储库时:

But when I try to convert the repository using:

hg convert  --filemap filemap MainRepo/ NewRepo

我收到以下错误:

...
<rev> message
1136 Merge with default
abort: unable to convert merge commit since target parents do not merge cleanly (file Folder1/Project1.csproj, parents 65b9b85aa32c and 923b315f094c)

过去有人遇到过这种问题吗?如何摆脱这种错误?我试图关闭与默认合并的分支，但这没有帮助.

Does any one had this kind of problem in the past? How to get rid of this kind of error? I tried to close branches that were merged with default, but it was of no help.

此外，在哪里可以找到有关如何清理存储库的资源?这个仓库使用了很多命名分支，它们非常混乱.

Also, where I can find resources on how to clean up repos? This repo uses a lot of named branches and they are very messy.

推荐答案

我能够通过关闭所有不活动的头部并最后删除rename .来解决此问题.对于我想要的东西，它工作得很好.

I was able to solve this by closing all my inactive heads and also removing the rename . at the end. For what I wanted it worked just fine.

这篇关于Mercurial-转换错误-无法转换合并提交的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！