中止：工作目录中未跟踪的文件与请求修订中的文件不同：'.hgignore'
我正在尝试提取一些文件和目录，并且收到以下消息：
当我查看存储库时，我可以看到文件已下载，但都包含 _ 作为前缀，甚至名称文件和文件夹包含 _
requesting all changes
adding changesets
adding manifests
adding file changes
added 1094 changesets with 4304 changes to 1071 files abort:
untracked file in working directory differs from file in requested revision: '.hgignore' [command interrupted]
有什么问题吗？
I am trying to pull some files and directories and I am having the following messages:
When I look in my repository I can see that the files have been downloaded but all contains _ as prefix, and even the names of files and folders contain _
requesting all changes
adding changesets
adding manifests
adding file changes
added 1094 changesets with 4304 changes to 1071 files abort:
untracked file in working directory differs from file in requested revision: '.hgignore' [command interrupted]
What is wrong?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
我认为您已经在工作目录中创建了
.hgignore，但没有将其添加到存储库 (hg add)。该文件是“未跟踪的”。来自另一个克隆的其他人也添加了此文件，并提交并推送了它。现在，当您尝试更新工作目录时，Mercurial 会尝试添加此文件，但会在工作目录中看到一个未跟踪且不同的同名文件。
有两种解决方案可以解决您的问题：
hg add将您自己的文件添加到存储库，然后重新运行更新。可能需要在更新之前提交文件。我建议使用第一个解决方案。
I think you have created a
.hgignorein your working directory without adding it to the repository (hg add). This file is "untracked".Someone else, from another clone, has added this file too, committed and pushed it. Now, when you try to update your working directory, Mercurial try to add this file but sees a file with the same name in your working directory which is untracked and different.
There's two solution to your problem :
hg add, then re-run the update. It will maybe be necessary to commit the file prior to the update.I'll advise using the first solution.
当您说存储库中的文件以
_作为前缀时，您正在往下查看.hg目录，不是吗？这是 Mercurial 本身的数据存储，其中的文件是修订日志，而不是您的文件。在.hg之外，您将有一个工作目录，其中的文件是您期望的实际文件。您现在没有得到其中之一，因为hg update拒绝更新工作目录，因为这样做会覆盖您未提交的.hgignore文件。您正在运行什么确切命令？看起来它正在执行
hg pull，然后执行hg update所以我猜hg clone但如果你已经有.hgignore躺在周围，这不是正确的命令。如果您使用hg pull -u或hg fetch您应该只使用hg pull来获取变更集。然后你可以：When you say the files in the repository have
_as a prefix, you're looking down inside the.hgdirectory aren't you? That's the data store for Mercurial itself and the files in there are revlogs, not your files. Outside of.hgyou'll have a working directory where the files are the actual files you expect. You're not getting one of those now becausehg updateis refusing to update the working directory because doing so would overwrite your uncomitted.hgignorefile.What exact command are you running? It looks like it's doing a
hg pullfollowed by anhg updateso I'd guesshg clonebut if you already have a.hgignorelying around that's not the right command to use. If instead you're usinghg pull -uorhg fetchyou should just usehg pullinstead to get the changesets. Then you can: