changeset 2061 | 5987c1eac2ce |
parent 2022 | a59da8cc35e4 |
child 2062 | 5460f0196f77 |
--- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -340,7 +340,13 @@ class dirstate(object): names.sort() # nd is the top of the repository dir tree nd = util.normpath(top[len(self.root) + 1:]) - if nd == '.': nd = '' + if nd == '.': + nd = '' + else: + hg = bisect.bisect_left(names, '.hg') + if hg < len(names) and names[hg] == '.hg': + if os.path.isdir(os.path.join(top, '.hg')): + continue for f in names: np = util.pconvert(os.path.join(nd, f)) if seen(np):