From: Pal-Kristian Engstad <pal_engstad@naughtydog.com>
Date: Fri, 22 Jan 2010 02:33:00 +0000 (-0800)
Subject: git-p4: Fix sync errors due to new server version
X-Git-Tag: v1.7.0-rc2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=562d53fa69933b3ade2691b99cbe67722313f43c;p=thirdparty%2Fgit.git

git-p4: Fix sync errors due to new server version

Fix sync errors due to new Perforce servers.

The P4D/NTX64/2009.2/228098 (2009/12/16) server reports
'move/delete' instead of 'delete'. This causes the Perforce
depot and the git repo to get out of sync. Fixed by adding
the new status string.

Signed-off-by: Pal-Kristian Engstad <pal_engstad@naughtydog.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index d1512e0acf..e7c48144e6 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1037,7 +1037,7 @@ class P4Sync(Command):
 
             if includeFile:
                 filesForCommit.append(f)
-                if f['action'] not in ('delete', 'purge'):
+                if f['action'] not in ('delete', 'move/delete', 'purge'):
                     filesToRead.append(f)
                 else:
                     filesToDelete.append(f)