equal
deleted
inserted
replaced
71 return r |
71 return r |
72 |
72 |
73 def _checkunknown(wctx, mctx): |
73 def _checkunknown(wctx, mctx): |
74 "check for collisions between unknown files and files in mctx" |
74 "check for collisions between unknown files and files in mctx" |
75 for f in wctx.unknown(): |
75 for f in wctx.unknown(): |
76 if f in mctx and mctx[f].cmp(wctx[f].data()): |
76 if f in mctx and mctx[f].cmp(wctx[f]): |
77 raise util.Abort(_("untracked file in working directory differs" |
77 raise util.Abort(_("untracked file in working directory differs" |
78 " from file in requested revision: '%s'") % f) |
78 " from file in requested revision: '%s'") % f) |
79 |
79 |
80 def _checkcollision(mctx): |
80 def _checkcollision(mctx): |
81 "check for case folding collisions in the destination context" |
81 "check for case folding collisions in the destination context" |