diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -26,7 +26,7 @@ class convert_mercurial(converter_sink): def putfile(self, f, e, data): self.repo.wwrite(f, data, e) - if self.repo.dirstate.state(f) == '?': + if f not in self.repo.dirstate: self.repo.dirstate.add(f) def copyfile(self, source, dest): @@ -58,7 +58,7 @@ class convert_mercurial(converter_sink): extra['branch'] = commit.branch if commit.rev: extra['convert_revision'] = commit.rev - + while parents: p1 = p2 p2 = parents.pop(0)