Mixed up directory name case

[Matt Mackall]

On Tue, 2012-04-03 at 09:58 +0200, Hertroys A. wrote:
> > On Mon, 2012-04-02 at 16:38 +0200, Hertroys A. wrote:
> > > I tried following the steps outlined in above link, but I can't figure
> > > out how to find this "bad revision". Which one is that anyway, the
> > > original one that created the badly named lower case "portal/ui.js" or
> > > the later one where it was replaced by the correctly named
> > > "Portal/ui.js"?
> > 
> > In the context of the wiki page, it's the revision you're trying to
> > check out. For a clone, that would be the default branch head. If you
> > try to fix an earlier version that's not a branch head.. you'll create a
> > new branch head, which would be unhelpful.
> 
> I must be doing something wrong then, as it's not working:
> 
> C:\ibi\repair>hg debugsetparents 1084
> 
> C:\ibi\repair>hg debugrebuildstate
> 
> C:\ibi\repair>hg rm -A "portal/menu.fex"

Missed a key step right here.

You forgot to put the cookies in the oven and then wondered why they're
so doughy. Instead of simply following the recipe, I recommend you try
to understand what it's doing. 

> C:\ibi\repair>hg co tip
> abort: case-folding collision between portal/menu.fex and Portal/menu.fex
> 
> 
> And that's only the first case-collision I'm running into... :(

Fix them all at once.

> I don't suppose upgrading to 2.1.2 would help after the case-collisions were introduced?

No.

> It would be really helpful for cases like these if hg would start a
> merge-tool displaying the differences between the conflicting files
> (there aren't any in my case), allowing to merge selected differences
> between them, reviewing the result of the merge and eventually letting
> the user choose which version to keep (much like how FreeBSD's
> mergemaster does things).

This is a different class of conflict from a merge conflict. Some
projects can and do have files that have names that Windows chokes on or
that cause collisions, so merging away those situations is the wrong
thing to do. Instead, we should be preventing the situation from
occurring in the first place when using only Windows clients (which I've
hopefully managed to do in 2.1.2).

-- 
Mathematics is the supreme nostalgia of our time.