undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Pal-Kristian Engstad 2010-01-21 18:33:00 -08:00 committed by Junio C Hamano
parent 8d9e7d5293
commit 562d53fa69
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fast-import/git-p4
View File

@ -1037,7 +1037,7 @@ class P4Sync(Command):
if includeFile: if includeFile:
filesForCommit.append(f) filesForCommit.append(f)
if f['action'] not in ('delete', 'purge'): if f['action'] not in ('delete', 'move/delete', 'purge'):
filesToRead.append(f) filesToRead.append(f)
else: else:
filesToDelete.append(f) filesToDelete.append(f)