Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 11702:eb07fbc21e9c
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 |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Jul 28 11:07:20 2010 +0200 +++ b/mercurial/merge.py Tue Jul 27 23:40:46 2010 +0900 @@ -73,7 +73,7 @@ def _checkunknown(wctx, mctx): "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].data()): + if f in mctx and mctx[f].cmp(wctx[f]): raise util.Abort(_("untracked file in working directory differs" " from file in requested revision: '%s'") % f)