在与 Mercurial 执行合并时如何自动保留删除？
我有一个存储库，我将其称为“子集”，它是从另一个存储库克隆的，我将其称为“完整”。我使用“hg rm”删除了子集中的许多文件。我现在需要从完整中提取对子集中剩余文件的更改，但我不想恢复我删除的任何文件。如果我先进行拉取，然后进行合并，则合并会以交互方式询问我是否要使用已更改的文件或将其保留为删除状态，以获取已完全更改的每个已删除文件。有什么方法可以自动删除所有已删除的文件并避免重复性压力伤害？
附带说明一下，一次性修复（例如在完整版本上使用 hg Convert？）不会成功，因为完整版本库和子集版本库都正在积极开发中，至少目前如此。
I have a repository I will call 'subset' which was cloned from another repository I will call 'full'. I deleted many files in subset using 'hg rm'. I now need to pull changes to the files remaining in subset from full, but I don't want to restore any of the files I deleted. If I do a pull followed by a merge, the merge will interactively ask me for each deleted file that was changed in full if I want to use the changed file or leave it deleted. Is there any way to automatically leave all deleted files deleted and save myself a repetitive stress injury?
As a side note, one time fixes (like using hg convert on full?) won't fly because both the full and subset repositories are being actively worked on, at least for now.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
最简单的方法是在修改的文件之上重新设置删除的基础。只要您没有重命名大量文件，这就会很好地工作。
有关更多详细信息，请参阅此答案 。
The easiest way to do this would be to rebase your removes on top of the modified files. This will work well as long as you didn't rename a lot of files.
See this answer for more details.
实际上，
hg Convert仍然是执行此操作的正确方法。以迭代方式转换作品，因此它只会带来新的更改集。使用带有一堆排除行的--filemap，只需使用相同的源克隆和目标克隆重新运行转换命令，您就可以在需要合并时迭代过滤。如果您将整个项目的一小部分发布给更广泛的受众，那么这是一种非常常见的模式。
Actually,
hg convertis still the right way to do this. Convert works in an iterative fashion, so it will bring across only the new change sets. Use a--filemapwith a bunch of exclude lines, and just re-run the convert command with the same source and destination clones, and you can iteratively filter whenever you need to merge.This is a very common pattern if, say, a fraction of your total project is released to a broader audience.