Skip to content

Commit

Permalink
git-p4: Fix sync errors due to new server version
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pal-Kristian Engstad authored and Junio C Hamano committed Feb 1, 2010
1 parent 8d9e7d5 commit 562d53f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 562d53f

Please sign in to comment.