mercurial - 解决Windows中的Mercurial案例折叠冲突

Question

我在StackOverflow上看到了其他Mercurial的案例折叠式答案-他们说，如果您可以访问区分大小写的文件系统(如unix)，请在此处进行检查并对其进行修复。问题是，我无权访问unix框，我是Windows开发人员，正在开发Windows应用程序。

在没有Unix机器的情况下如何解决此问题？

Answer 1

目前正在处理filesystem帮助主题，该主题将包含在下一版本的Mercurial中:

https://www.mercurial-scm.org/pipermail/mercurial-devel/2012-April/039522.html

Renaming colliding files

On case-insensitive filesystems, updating to revisions which have files with case collisions will abort, even with --check or --clean.

To repair such revisions, you should give new names to one or both of the colliding files on a case-sensitive filesystem, and commit them to create new collision safe revision.

.. note:: If you want to (or need to) browse or repair such revisions on case-insensitive filesystems, please see 'Updating manually' section.

If :hg:merge is aborted, but :hg:update --check to each revisions successes, collision occurs between revision to be merged.

In this case, files in one of them or both should be renamed to avoid collision before merging.

With recent Mercurial, you can change case of filename safely in steps below, even on case-insensitive filesystems::

$ hg rename a.txt tmp
$ hg rename tmp A.TXT

Updating manually

If you want to (or need to) update working directory by the revision causing case-folding collision on case-insensitive filesystems, to rename colliding files or browsing contents at such revision for example, please see the Wiki page below::

https://www.mercurial-scm.org/wiki/ManualCheckout

This is NOT recommended for non expert Mercurial users.

此处介绍了另一种类似的手动方法:

https://www.mercurial-scm.org/wiki/FixingCaseCollisions

但是，这也会深入到Mercurial内部，因此除非万不得已，否则应避免使用它。