提交 562d53fa 编写于 作者: P Pal-Kristian Engstad 提交者: Junio C Hamano

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: NPal-Kristian Engstad <pal_engstad@naughtydog.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 8d9e7d52
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册