diff options
| author |  Simon Hausmann <hausmann@kde.org> | 2007-03-20 21:13:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <hausmann@kde.org> | 2007-03-20 21:13:49 +0100 |
| commit | c715706b15426c7b106677868ce48e4bd78b94d6 (patch) | |
| tree | 566ded9bce46e98226cb354d72fb74dcb45c280a /contrib/fast-import | |
| parent | Added missing "self"s to make the script evaluate correctly. (diff) | |
| download | tgif-c715706b15426c7b106677868ce48e4bd78b94d6.tar.xz | |
Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4.py b/contrib/fast-import/git-p4.py index 8cb63f9540..54ddf73dac 100755 --- a/contrib/fast-import/git-p4.py +++ b/contrib/fast-import/git-p4.py @@ -480,7 +480,7 @@ class GitSync(Command): return "" - def commit(self, details, files, branch, branchPrefix, parent, merged = ""): + def commit(self, details, files, branch, branchPrefix, parent = "", merged = ""): epoch = details["time"] author = details["user"] @@ -757,6 +757,7 @@ class GitSync(Command): newestRevision = change if info["action"] == "delete": + fileCnt = fileCnt + 1 continue for prop in [ "depotFile", "rev", "action", "type" ]: @@ -768,7 +769,7 @@ class GitSync(Command): try: self.commit(details, self.extractFilesFromCommit(details), self.branch, self.globalPrefix) - except: + except IOError: print self.gitError.read() else: |