Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann committed
Mar 20, 2007 at 21:13 UTC
c715706b15426c7b106677868ce48e4bd78b94d6
1 file changed
+3
-2
contrib/fast-import/git-p4.py
+3
-2
@@ -480,7 +480,7 @@ class GitSync(Command):
480
481
return ""
482
483
- def commit(self, details, files, branch, branchPrefix, parent, merged = ""):
483
+ def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""):
484
epoch = details["time"]
485
author = details["user"]
486
@@ -757,6 +757,7 @@ class GitSync(Command):
757
newestRevision = change
758
759
if info["action"] == "delete":
760
+ fileCnt = fileCnt + 1
761
continue
762
763
for prop in [ "depotFile", "rev", "action", "type" ]:
@@ -768,7 +769,7 @@ class GitSync(Command):
769
770
try:
771
self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix)
771
- except:
772
+ except IOError:
773
print self.gitError.read()
774
775
else: