Mercurial > hg
changeset 16534:11212babc690 stable
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 | 95698ee29181 |
| children | 39d1f83eb05d |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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]))