Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>There is a <code>filesystem</code> help topic being worked on that will be included in the next version of Mercurial:</p> <p><a href="https://www.mercurial-scm.org/pipermail/mercurial-devel/2012-April/039522.html" rel="nofollow noreferrer">https://www.mercurial-scm.org/pipermail/mercurial-devel/2012-April/039522.html</a></p> <blockquote> <p><strong>Renaming colliding files</strong></p> <p>On case-insensitive filesystems, updating to revisions which have files with case collisions will abort, even with <code>--check</code> or <code>--clean</code>.</p> <p>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.</p> <p>.. note:: If you want to (or need to) browse or repair such revisions on case-insensitive filesystems, please see 'Updating manually' section.</p> <p>If :hg:<code>merge</code> is aborted, but :hg:<code>update --check</code> to each revisions successes, collision occurs between revision to be merged.</p> <p>In this case, files in one of them or both should be renamed to avoid collision before merging.</p> <p>With recent Mercurial, you can change case of filename safely in steps below, even on case-insensitive filesystems::</p> <pre><code>$ hg rename a.txt tmp $ hg rename tmp A.TXT </code></pre> <p><strong>Updating manually</strong></p> <p>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::</p> <p><a href="https://www.mercurial-scm.org/wiki/ManualCheckout" rel="nofollow noreferrer">https://www.mercurial-scm.org/wiki/ManualCheckout</a></p> <p>This is NOT recommended for non expert Mercurial users.</p> </blockquote> <p>Another similar manual method is described here:</p> <p><a href="https://www.mercurial-scm.org/wiki/FixingCaseCollisions" rel="nofollow noreferrer">https://www.mercurial-scm.org/wiki/FixingCaseCollisions</a></p> <p>This also dives rather deep into Mercurial internals though, so you should avoid it unless as a last resort.</p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload