abort: case-folding collision

[David Montgomery]

Hi,

I'm getting the "abort: case-folding collision" error on my repository.
Using hgwebdir.cgi I see a revision that references the same file twice,
with different (cased) directories: [...]/DirectoryName/file.py and
[...]/directoryname/file.py

Last December Benoit Boissinot wrote:
> To fix it, you just need to clone -r <head1> -r <head2> ...

I haven't been able to get this to work.  I'm not sure what revisions
I would use for the two heads.

After some experimentation, I now have a local repository with all
the changesets, and I've updated the files to the changeset just before
the directory rename.  But any updates I do to move it past that give
the "abort: case-folding collision" error.

How can I work around this?

Thanks much,
David Montgomery