# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1165273831 21600
# Node ID 6398ff7cb705421cb883607a66d9ce1744a27cf1
# Parent  1427949b8f809c7c5b39c1ca5839390ec1c9bce6
imported patch collision

diff -r 1427949b8f80 -r 6398ff7cb705 mercurial/merge.py
--- a/mercurial/merge.py	Mon Dec 04 17:10:29 2006 -0600
+++ b/mercurial/merge.py	Mon Dec 04 17:10:31 2006 -0600
@@ -68,6 +68,16 @@
                 raise util.Abort(_("untracked local file '%s' differs"\
                                    " from remote version") % f)
 
+def checkcollision(mctx):
+    "check for case folding collisions in the destination context"
+    folded = {}
+    for fn in mctx.manifest():
+        fold = fn.lower()
+        if fold in folded:
+            raise util.Abort(_("case-folding collision between %s and %s")
+                             % (fn, folded[fold]))
+        folded[fold] = fn
+
 def forgetremoved(wctx, mctx):
     """
     Forget removed files
@@ -460,6 +470,8 @@
     action = []
     if not force:
         checkunknown(wc, p2)
+    if not util.checkfolding(repo.path):
+        checkcollision(p2)
     if not branchmerge:
         action += forgetremoved(wc, p2)
     action += manifestmerge(repo, wc, p2, pa, overwrite, partial)