In main, resolving.

Now in crew as changeset 482581431dcd

Fix posted to mercurial-devel as part of the patch series at
http://www.selenic.com/pipermail/mercurial-devel/2008-April/006078.html

Looks good to me.

This patch also fixes Issue912

While Patrick's patch is a bit too magical, it is correct in practical terms.
The problem is that a case-changing rename appears as a 'r' (remove) action and
a 'g' (get) action, on 2 files which only differ in case. These 2 actions may be
done in either order on a case-preserving system, but on a case-folding system
it is essential that the remove is done before the get.

I have attached a patch which sorts the list case insensitively on case-folding
systems. This keeps remove/get pairs on filenames that only differ in case, in
the right order. It fixes this issue, and does not introduce any test failures
on Windows.

(By the way, is it right that Mercurial code needs to stick with Python 2.3
compatibility? I assumed so, and used a comparison function rather than a key
function)

See also Issue1083 ("Case collision error between different revisions in history")

C:\TEMP\hgtest>hg manifest
AAA.txt
aaa.txt

So it does seem to think that they're both there.  I have to conclude that
something goes wrong during the hgpullsvn, as AAA.txt really does not exist in
the current-most version.  See hgpullsvn.exe output:

C:\TEMP\hgtest>\Python25\Scripts\hgpullsvn.exe
* c:\apps\subversion\bin\svn.exe "info" "--xml" "."
* c:\apps\subversion\bin\svn.exe "info" "--xml"
"svn+ssh://cpbotha@luxemburg.twi.tudelft.nl/home/cpbotha/work/svn/testing/hgtest"
No revisions after 2 in SVN repo, nothing to do

and then:
C:\TEMP\hgtest>svn list
aaa.txt

C:\TEMP\hgtest>hg manifest default
abort: unknown revision 'default'!

I have however managed to create a small test-case for others to test.  You can
download a small hgimportsvn repo from
http://visualisation.tudelft.nl/~cpbotha/thingies/hgtest.zip (5K)

Steps were:
1. create SVN repo on Linux, add AAA.txt, svn rename to aaa.txt, then commit
2. use hgimportsvn + hgpullsvn on Windows to create synced HG repo

If you unpack hgtest.zip on Windows, and use mercurial version
1e4ddc9ac9f7+20080325 (this was the 1.0 binary download) to do "hg update",
you'll get the feared: 
C:\TEMP\hgtest>hg update
abort: case-folding collision between aaa.txt and AAA.txt

Interestingly, if you do step 2 on Linux, then clone / copy the repo to Windows,
the error does not occur.

Thanks for looking into this!

That really sounds like you have -both- names in the manifest you're trying to
update to.

Can you double-check 'hg manifest default'?

Sure!

C:\work\code\hg\devide>hg co null
0 files updated, 0 files merged, 1197 files removed, 0 files unresolved

C:\work\code\hg\devide>hg update
abort: case-folding collision between devide/docs/help/devide.chm and
devide/docs/help/DeVIDE.chm

I tried it again, just to make sure:

C:\work\code\hg\devide>hg update
abort: case-folding collision between devide/docs/help/devide.chm and
devide/docs/help/DeVIDE.chm

Can you do "hg co null" followed by an update?

I am using mercurial (version 1e4ddc9ac9f7+20080325) on Windows XP SP2 to work from an hgsvn synchronised repository.  The problem is that I changed the case of a single filename a while back, and now hg is choking on this:

C:\work\code\hg\devide>hg update
abort: case-folding collision between devide/docs/help/devide.chm and devide/docs/help/DeVIDE.chm

Note that only the lowercase devide.chm still exists in this directory, I quadruple-checked.

UNLIKE the test cases below, repeated "hg update"s do NOT succeed.  Each time I do "hg update", I get exactly the same behaviour.  With my mercurial installation,  I can also reproduce the test cases below, and it does succeed after the second try.  

To reproduce on Windows (this takes a while and needs hgsvn):

mkdir dhelp
cd dhelp
hgimportsvn.exe http://devide.googlecode.com/svn/trunk/devide/docs/help/
cd help
hgpullsvn
hg update

I would appreciate any help on this.  I'm on my mobile phone connection at the moment, but if anyone's interested, I could tarball up a small mercurial repo with which one should be able to reproduce the problem more easily.

Similar to Issue912, simply repeating the last command succeeds:

> hg version
Mercurial Distributed SCM (version 9f1e6ab76069+tortoisehg)
...
> cd
C:\tmp\repos\testrepo
> hg init
> echo aaa >aaa.txt
> hg add
adding aaa.txt
> hg ci -m 1
> hg ren aaa.txt qqq
> hg ren qqq AAA.TXT
> hg ci -m 2
> hg update -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
> hg --traceback update -C 1
Traceback (most recent call last):
  File "mercurial\dispatch.pyc", line 45, in _runcatch
  File "mercurial\dispatch.pyc", line 360, in _dispatch
  File "mercurial\dispatch.pyc", line 413, in _runcommand
  File "mercurial\dispatch.pyc", line 369, in checkargs
  File "mercurial\dispatch.pyc", line 352, in <lambda>
  File "mercurial\commands.pyc", line 2650, in update
  File "mercurial\hg.pyc", line 286, in clean
  File "mercurial\merge.pyc", line 684, in update
  File "mercurial\merge.pyc", line 579, in recordupdates
  File "mercurial\dirstate.pyc", line 236, in normal
WindowsError: [Error 2] The system cannot find the file specified:
'C:\\tmp\\repos\\testrepo\\AAA.TXT'
abort: The system cannot find the file specified: C:\tmp\repos\testrepo\AAA.TXT
> hg --traceback update -C 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

See also:
Issue912 ("hg update fails on Windows if case of file changed in repo")

Repeating use case sequence with current TortoiseHg 0.3 (released on 2008-02-01):

> hg version
Mercurial Distributed SCM (version 9f1e6ab76069+tortoisehg)
...
> cd
C:\tmp\repos\testrepo
> hg init
> echo aaa >aaa.txt
> hg add
adding aaa.txt
> hg ci -m 1
> hg ren aaa.txt qqq
> hg ren qqq AAA.TXT
> hg ci -m 2
> hg update -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
> hg --traceback update -C 1
Traceback (most recent call last):
  File "mercurial\dispatch.pyc", line 45, in _runcatch
  File "mercurial\dispatch.pyc", line 360, in _dispatch
  File "mercurial\dispatch.pyc", line 413, in _runcommand
  File "mercurial\dispatch.pyc", line 369, in checkargs
  File "mercurial\dispatch.pyc", line 352, in <lambda>
  File "mercurial\commands.pyc", line 2650, in update
  File "mercurial\hg.pyc", line 286, in clean
  File "mercurial\merge.pyc", line 684, in update
  File "mercurial\merge.pyc", line 579, in recordupdates
  File "mercurial\dirstate.pyc", line 236, in normal
WindowsError: [Error 2] The system cannot find the file specified:
'C:\\tmp\\repos\\testrepo\\AAA.TXT'
abort: The system cannot find the file specified: C:\tmp\repos\testrepo\AAA.TXT

Fixing title.

This fix is a bit too magical. And if we want removes to sort first, we can
simply change their key. This will also probably break cases where the move
needs a merge.

Perhaps we should do a silly-rename. That is: detect the rename collision,
rename to something silly, then do a fixup afterwards.

Posted by Andrei Vermel, with suggested patch attached:

C:\temp\aaa>hg version
Mercurial Distributed SCM (version 81575b7b505e)

Copyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

C:\temp\aaa>hg init
C:\temp\aaa>echo aaa >aaa.txt
C:\temp\aaa>hg add
adding aaa.txt
C:\temp\aaa>hg ci -m 1
C:\temp\aaa>hg ren aaa.txt qqq
C:\temp\aaa>hg ren qqq AAA.TXT
C:\temp\aaa>hg ci -m 2
C:\temp\aaa>hg update -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
C:\temp\aaa>hg --traceback update -C 1
Traceback (most recent call last):
  File "C:\Python24\Lib\site-packages\mercurial\dispatch.py", line 45, in _runcatch
    return _dispatch(ui, args)
  File "C:\Python24\Lib\site-packages\mercurial\dispatch.py", line 348, in _dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "C:\Python24\Lib\site-packages\mercurial\dispatch.py", line 401, in
_runcommand
    return checkargs()
  File "C:\Python24\Lib\site-packages\mercurial\dispatch.py", line 357, in checkargs
    return cmdfunc()
  File "C:\Python24\Lib\site-packages\mercurial\dispatch.py", line 340, in <lambda>
    d = lambda: func(ui, repo, *args, **cmdoptions)
  File "C:\Python24\Lib\site-packages\mercurial\commands.py", line 2713, in update
    return hg.clean(repo, rev)
  File "C:\Python24\Lib\site-packages\mercurial\hg.py", line 273, in clean
    stats = _merge.update(repo, node, False, True, None)
  File "C:\Python24\Lib\site-packages\mercurial\merge.py", line 628, in update
    recordupdates(repo, action, branchmerge)
  File "C:\Python24\Lib\site-packages\mercurial\merge.py", line 526, in
recordupdates
    repo.dirstate.normal(f)
  File "C:\Python24\Lib\site-packages\mercurial\dirstate.py", line 221, in normal
    s = os.lstat(self._join(f))
OSError: [Errno 2] No such file or directory: 'C:\\temp\\aaa\\AAA.TXT'
abort: No such file or directory: C:\temp\aaa\AAA.TXT