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

Pal-Kristian Engstad· Jan 22, 2010, 02:33 UTC · lore

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>
---
 contrib/fast-import/git-p4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to contrib/fast-import/git-p4 +1 −1

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 48059d0..1c73e5f 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)

-- 
1.6.5.2.6.gc3c1e.dirty

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