Mixed up directory name case

[Hertroys A.]

> 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"

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... :(

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

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).

Regards,
Alban.

 
alban.hertroys at apollovredestein.com
T: 

Apollo Vredestein B.V. - P.O. Box 27 - 7500 AA Enschede - The Netherlands - Chamber of Commerce number 34223268 - http://www.apollovredestein.com

The information contained in this e-mail is intended solely for the use of the individual or entity to whom it is addressed and others authorized to receive it. You are hereby notified that any disclosure, copying, distribution or action in relation to the contents of this information is strictly prohibited. If you are not the intended recipient, please delete this message and any attachments and advise the sender by return e-mail. The confidentiality of this message is not warranted. Apollo Vredestein B.V. rules out any and every liability resulting from this or any other electronic transmission.
--------------------------------------------------------------------------