From: Simon Hausmann <simon@lst.de>
Date: Sun, 8 Apr 2007 08:13:32 +0000 (+0200)
Subject: Fix file determination for #head imports
X-Git-Tag: v1.5.3-rc0~65^2^2~136
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c45b1cfe1eda2cc67c4f07a0cd6986911d7c2fd8;p=git.git

Fix file determination for #head imports

Signed-off-by: Simon Hausmann <simon@lst.de>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 0a22d9a2e..28b088544 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -938,7 +938,8 @@ class P4Sync(Command):
                     newestRevision = change
 
                 if info["action"] == "delete":
-                    fileCnt = fileCnt + 1
+                    # don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
+                    #fileCnt = fileCnt + 1
                     continue
 
                 for prop in [ "depotFile", "rev", "action", "type" ]: