Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 11702:eb07fbc21e9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filectx: use cmp(self, fctx) instead of cmp(self, text) This allows more flexibility in implementation, and in particular, lets the context decide if revision text has to be loaded or not.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Tue, 27 Jul 2010 23:40:46 +0900
parents 34e33d50c26b
children a286a4ecbfeb
comparison
equal deleted inserted replaced
11701:84fb29f5e0d2 11702:eb07fbc21e9c
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"