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>
Pal-Kristian Engstad committed
Jan 21, 2010 at 18:33 UTC
562d53fa69933b3ade2691b99cbe67722313f43c
1 file changed
+1
-1
contrib/fast-import/git-p4
+1
-1
@@ -1037,7 +1037,7 @@ class P4Sync(Command):
1037
1038
if includeFile:
1039
filesForCommit.append(f)
1040
- if f['action'] not in ('delete', 'purge'):
1040
+ if f['action'] not in ('delete', 'move/delete', 'purge'):
1041
filesToRead.append(f)
1042
else:
1043
filesToDelete.append(f)