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.
--- a/mercurial/merge.py Fri Apr 27 13:07:29 2012 -0500
+++ b/mercurial/merge.py Fri Apr 27 13:18:09 2012 -0500
@@ -83,7 +83,7 @@
def _checkunknownfile(repo, wctx, mctx, f):
return (not repo.dirstate._ignore(f)
- and os.path.exists(repo.wjoin(f))
+ and os.path.isfile(repo.wjoin(f))
and repo.dirstate.normalize(f) not in repo.dirstate
and mctx[f].cmp(wctx[f]))