1353538 - hg "abort: case-folding collision between toolkit/components/places/tests/unifiedcom plete/test_autofill_default_behavior.js and toolkit/components/places/tests/unif iedcomplete/test_autoFill_default_behavior.js"

Status: RESOLVED WORKSFORME

(Toolkit :: Places, defect)

Description

[Daniel Holbert [:dholbert]]

I have a mac machine that I haven't used in a while, and it was sitting at this revision from Sept 2016:
 https://hg.mozilla.org/mozilla-central/rev/60cc643978c7

I just tried to do "hg pull -u" on it, but it failed to update to the latest revision, with this error:
{
abort: case-folding collision between toolkit/components/places/tests/unifiedcom
plete/test_autofill_default_behavior.js and toolkit/components/places/tests/unif
iedcomplete/test_autoFill_default_behavior.js
}

This seems to be fallout from bug 1311049, which (in a single commit) renamed test_autoFill_default_behavior.js to a different-case-spelling of its name (new name has a lowercase "f").  This is problematic on case-insensitive filesystems, apparently.

I'm hopeful that I can work around it locally (and I doubt there's much we can do to fix it now, other than document how to get back to a working state -- hence this bug).

Comment 1

[Daniel Holbert [:dholbert]]

This machine has macOS 10.12 with mercurial 4.1.2 (from "brew"), BTW.

Comment 2

[Gregory Szorc [:gps]]

`hg up null` + `hg up <rev>` will fix it.

Comment 3

[Daniel Holbert [:dholbert]]

OK, I got it sorted out. (I went a slightly different route from comment 2 -- my working directory had a bunch of untracked files, possibly from the original "hg pull -u" having been interrupted.  So I deleted all of those and then tried updating to the tip revision again, and that time it was fine.)