Browse files

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 <>
Signed-off-by: Junio C Hamano <>
  • Loading branch information...
1 parent 8d9e7d5 commit 562d53fa69933b3ade2691b99cbe67722313f43c @engstad engstad committed with gitster Jan 22, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 contrib/fast-import/git-p4
@@ -1037,7 +1037,7 @@ class P4Sync(Command):
if includeFile:
- if f['action'] not in ('delete', 'purge'):
+ if f['action'] not in ('delete', 'move/delete', 'purge'):

0 comments on commit 562d53f

Please sign in to comment.