abort: case-folding collision

Benoit Boissinot bboissin at gmail.com
Fri Dec 15 11:58:32 CST 2006


On 12/15/06, Shane Holloway <shane.holloway at ieee.org> wrote:
> On Dec 14, 2006, at 9:55 PM, Benoit Boissinot wrote:
> > On 12/15/06, Shane Holloway <shane.holloway at ieee.org> wrote:
> >> No, that repo was entirely mercurial based.
> >
> > And does the repo passes 'verify' ?
>
> No, it doesn't verify, but only in the affected area of the rename.
>
To fix it, you just need to clone -r <head1> -r <head2> ...

Trying to fix the repo is hard, but I can explain how you ended in
that situation:

in some rev you had:
sandbox/openGL/opengl/glext/<somefiles> and you
hg mv'd sandbox/openGL/opengl/* to sandbox/opengl/*

that's how you ended with a collision between sandbox/openGL and sandbox/opengl

(the repo is hard to fix, because it is the filenames embedded in renames, etc)

regards,

Benoit


More information about the Mercurial mailing list