合并已（本地）删除的文件夹
我正在使用 Mercurial，但遇到了一个我不知道如何解决的问题。我目前面临的问题如下：
- 我们有一个最初称为 A 的项目（文件夹），并将其推送到远程存储库。
- 我将项目 A 重命名为 B 并将其推送到远程存储库。在此过程中，我还在本地将项目 A 重命名为 B。
- 项目 A 已从远程存储库中删除。
- 我尝试拉取这些更改，但 Mercurial 似乎感到困惑，因为文件（或文件路径）在本地不再存在。
如果我调用“hg merge”，则会产生以下输出： “中止：未提交的未提交更改，......” 如果我随后调用“hg status”，则会列出项目 A 初始版本中的所有文件 - 这些文件现在不再在本地可用，因为路径已从 A/ 更改。 ../... 到 B/.../...
任何人都可以给我有关如何解决此问题的提示或技巧吗？
I'm using Mercurial and ran into an issue I'm not sure how to resolve. The issue I'm facing at the moment is as follows:
- We had a project (folder) that was initially called A and pushed that to a remote repository.
- I renamed Project A to B and pushed it to the remote repository. While doing so, I also locally renamed Project A to B.
- Project A was removed from the remote repository.
- I tried to pull those changes but Mercurial seems to get confused as the files (or paths to files) do not exist locally anymore.
If I'm invoking 'hg merge', the following output is produced:
"Abort: outstanding uncommitted changes, ..."
If I then invoke 'hg status', all the files which were in the initial version of Project A are listed - which now are not locally available anymore because the paths have changed from A/.../... to B/.../...
Can anybody give me a hint or tip on how to resolve this issue?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
列出的文件是否被列为“已删除”（RI 认为）？
如果是，只需提交此更改（关于已删除的文件），然后合并。 Mercurial 必须了解所有更改，包括移动或删除的文件。
Are the listed files listed as "deleted" (R I think)?
If yes, just commit this change (about the deleted files), then merge. Mercurial have to know about all the changes, including the files moved or removed.