[PATCH stable] update: don't clobber untracked files with wrong casing

[Matt Mackall]

On Wed, 2011-11-16 at 03:01 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <mads at kiilerich.com>
> # Date 1321408811 -3600
> # Node ID c14fcb1a3a4116ad295e3fd342e28db1714174e7
> # Parent  1e8f8b65e7ebe49abdbaaf2d5b4ea5ca7f6db950
> update: don't clobber untracked files with wrong casing
> 
> diff --git a/mercurial/merge.py b/mercurial/merge.py
> --- a/mercurial/merge.py
> +++ b/mercurial/merge.py
> @@ -81,10 +81,18 @@
>              self.mark(dfile, 'r')
>          return r
>  
> -def _checkunknown(wctx, mctx):
> +def _checkunknown(wctx, mctx, folding):
>      "check for collisions between unknown files and files in mctx"
> -    for f in wctx.unknown():
> -        if f in mctx and mctx[f].cmp(wctx[f]):
> +    if folding:
> +        foldf = encoding.lower

This should use util.normcase.

-- 
Mathematics is the supreme nostalgia of our time.