Browse Source

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>
maint
Pal-Kristian Engstad 15 years ago committed by Junio C Hamano
parent
commit
562d53fa69
  1. 2
      contrib/fast-import/git-p4

2
contrib/fast-import/git-p4

@ -1037,7 +1037,7 @@ class P4Sync(Command): @@ -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)

Loading…
Cancel
Save