changeset 4906 | 30847b8af7ca |
parent 4904 | 6fd953d5faea |
child 4965 | 4106dde15aed |
--- a/hgext/convert/hg.py Sat Jul 21 16:02:09 2007 -0500 +++ b/hgext/convert/hg.py Sat Jul 21 16:02:09 2007 -0500 @@ -26,7 +26,7 @@ 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 @@ extra['branch'] = commit.branch if commit.rev: extra['convert_revision'] = commit.rev - + while parents: p1 = p2 p2 = parents.pop(0)