Show More
@@ -68,6 +68,16 b' def checkunknown(wctx, mctx):' | |||||
68 | raise util.Abort(_("untracked local file '%s' differs"\ |
|
68 | raise util.Abort(_("untracked local file '%s' differs"\ | |
69 | " from remote version") % f) |
|
69 | " from remote version") % f) | |
70 |
|
70 | |||
|
71 | def checkcollision(mctx): | |||
|
72 | "check for case folding collisions in the destination context" | |||
|
73 | folded = {} | |||
|
74 | for fn in mctx.manifest(): | |||
|
75 | fold = fn.lower() | |||
|
76 | if fold in folded: | |||
|
77 | raise util.Abort(_("case-folding collision between %s and %s") | |||
|
78 | % (fn, folded[fold])) | |||
|
79 | folded[fold] = fn | |||
|
80 | ||||
71 | def forgetremoved(wctx, mctx): |
|
81 | def forgetremoved(wctx, mctx): | |
72 | """ |
|
82 | """ | |
73 | Forget removed files |
|
83 | Forget removed files | |
@@ -460,6 +470,8 b' def update(repo, node, branchmerge, forc' | |||||
460 | action = [] |
|
470 | action = [] | |
461 | if not force: |
|
471 | if not force: | |
462 | checkunknown(wc, p2) |
|
472 | checkunknown(wc, p2) | |
|
473 | if not util.checkfolding(repo.path): | |||
|
474 | checkcollision(p2) | |||
463 | if not branchmerge: |
|
475 | if not branchmerge: | |
464 | action += forgetremoved(wc, p2) |
|
476 | action += forgetremoved(wc, p2) | |
465 | action += manifestmerge(repo, wc, p2, pa, overwrite, partial) |
|
477 | action += manifestmerge(repo, wc, p2, pa, overwrite, partial) |
General Comments 0
You need to be logged in to leave comments.
Login now