Case folding collision in Mercurial (WinXP)
Dan Craft
DCraft at PacBell.net
Tue Jun 24 14:03:49 CDT 2008
>I'm not quite clear what you're trying to do, but you should be able to
>'manually revert' by either cloning your repo and copying files or using
>'hg cat'. Alternately, you can use hg diff to capture your changes,
>check out an old revision, then apply (most of) the diff.
Thanks, Matt. A couple more answers will help me on my way.
Did you mean clone using 'hg clone'? That aborts with the "case-folding collision". What do I lose if I just copy the repository via filesys commands? (Once I have this sandbox, I can just try stuff.)
The tricky piece seems it will be getting rid of the duplicate/incorrectly capitalized dirs under .hg/. I'm presuming it would NOT be reasonable to just go in and remove those. Given the changeset which introduced the corruption (on 5/23, rev 11) is the latest, I MAY be able to use 'hg rollback' to remove those dirs (assuming it doesn't abort). That would look something like:
(1) logically clone the repository
- copy the repository directory
- remove any files in the workspace added since r11
- 'hg revert' to r11 [at least] files modified since r11; (if it aborts; use 'hg cat' individually)
(2) 'hg rollback'; (if it aborts, ?)
(3) re-establish r11 with new commit
(4) copy from orig workspace files modified since r11
The 'hg diff' approach doesn't seem it would work for non-text files, but if 'hg revert' aborts might use it for the rest.
To get started, I need to know about cloning via copying (and am open to any other suggestion).
Thx.
--Dan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080624/e9e15725/attachment.html
More information about the Mercurial
mailing list