Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 16534:11212babc690 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: check for untracked files more precisely (issue3400) This fixes the regression, but still leaves the long-standing issue that merge doesn't cope with trying to merge files and directories.
author Matt Mackall <mpm@selenic.com>
date Fri, 27 Apr 2012 13:18:09 -0500
parents 774e2dcd0a65
children ebf6d38c9063
comparison
equal deleted inserted replaced
16533:95698ee29181 16534:11212babc690
81 self.mark(dfile, 'r') 81 self.mark(dfile, 'r')
82 return r 82 return r
83 83
84 def _checkunknownfile(repo, wctx, mctx, f): 84 def _checkunknownfile(repo, wctx, mctx, f):
85 return (not repo.dirstate._ignore(f) 85 return (not repo.dirstate._ignore(f)
86 and os.path.exists(repo.wjoin(f)) 86 and os.path.isfile(repo.wjoin(f))
87 and repo.dirstate.normalize(f) not in repo.dirstate 87 and repo.dirstate.normalize(f) not in repo.dirstate
88 and mctx[f].cmp(wctx[f])) 88 and mctx[f].cmp(wctx[f]))
89 89
90 def _checkunknown(repo, wctx, mctx): 90 def _checkunknown(repo, wctx, mctx):
91 "check for collisions between unknown files and files in mctx" 91 "check for collisions between unknown files and files in mctx"