{"thread":{"id":"22335","subject":"[PATCH] git-p4: Fix sync errors due to new server version","startedAt":"2010-01-22T02:33:00Z","lastAt":"2010-01-22T02:33:00Z","messageCount":1,"participants":["Pal-Kristian Engstad"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"132364","messageId":"4B590E5C.9@naughtydog.com","threadId":"22335","inReplyTo":null,"subject":"[PATCH] git-p4: Fix sync errors due to new server version","fromName":"Pal-Kristian Engstad","fromEmail":"pal_engstad@naughtydog.com","sentAt":"2010-01-22T02:33:00Z","receivedAt":"2010-01-22T02:33:00Z","isPatch":true,"sender":{"key":"pal_engstad@naughtydog.com","avatar":null},"body":"Fix sync errors due to new Perforce servers.\n\nThe P4D/NTX64/2009.2/228098 (2009/12/16) server reports\n'move/delete' instead of 'delete'. This causes the Perforce\ndepot and the git repo to get out of sync. Fixed by adding\nthe new status string.\n\nSigned-off-by: Pal-Kristian Engstad <pal_engstad@naughtydog.com>\n---\n contrib/fast-import/git-p4 |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4\nindex 48059d0..1c73e5f 100755\n--- a/contrib/fast-import/git-p4\n+++ b/contrib/fast-import/git-p4\n@@ -1037,7 +1037,7 @@ class P4Sync(Command):\n \n             if includeFile:\n                 filesForCommit.append(f)\n-                if f['action'] not in ('delete', 'purge'):\n+                if f['action'] not in ('delete', 'move/delete', 'purge'):\n                     filesToRead.append(f)\n                 else:\n                     filesToDelete.append(f)\n-- \n1.6.5.2.6.gc3c1e.dirty\n"}]}