{"thread":{"id":"22310","subject":"Dangerous new server status for deleted files","startedAt":"2010-01-20T20:16:38Z","lastAt":"2010-01-21T00:28:13Z","messageCount":2,"participants":["Pal-Kristian Engstad","Johan Herland"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"132213","messageId":"4B5764A6.30504@naughtydog.com","threadId":"22310","inReplyTo":null,"subject":"Dangerous new server status for deleted files","fromName":"Pal-Kristian Engstad","fromEmail":"pal_engstad@naughtydog.com","sentAt":"2010-01-20T20:16:38Z","receivedAt":"2010-01-20T20:16:38Z","isPatch":false,"sender":{"key":"pal_engstad@naughtydog.com","avatar":null},"body":"Hi,\n\nOur new Perforce server (P4D/NTX64/2009.2/228098 2009/12/16) seems to be \ngiving out 'move/delete' instead of the old 'delete' status for files \nthat are moved within the repo. Attached is the simple patch to fix it. \n(By the way: How do you \"sign off\" a patch?) This is urgent, as it will \ncorrupt git repos trying to track a Perforce depot.\n\nThanks,\n\nPKE.\n\n-- \nPål-Kristian Engstad (engstad@naughtydog.com), \nLead Graphics & Engine Programmer,\nNaughty Dog, Inc., 1601 Cloverfield Blvd, 6000 North,\nSanta Monica, CA 90404, USA. Ph.: (310) 633-9112.\n\n\"Emacs would be a far better OS if it was shipped with \n a halfway-decent text editor.\" -- Slashdot, Dec 13. 2005.\n\n\n\n\nFrom bbc0cf2dbd318faaf5731b684d67c5b2126cb1e0 Mon Sep 17 00:00:00 2001\nFrom: Pal-Kristian Engstad <pal_engstad@naughtydog.com>\nDate: Wed, 20 Jan 2010 12:07:21 -0800\nSubject: [PATCH] git-p4: Fix sync errors due to new server version.\n\nNew server P4D/NTX64/2009.2/228098 (2009/12/16) reports 'move/delete' instead of 'delete'. This causes files that are\nmoved to leave their old file in git. Fixed by adding the new status string.\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 6303449..ef7c23b 100755\n--- a/contrib/fast-import/git-p4\n+++ b/contrib/fast-import/git-p4\n@@ -1089,7 +1089,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\n"},{"id":"132246","messageId":"201001210128.13772.johan@herland.net","threadId":"22310","inReplyTo":"4B5764A6.30504@naughtydog.com","subject":"Re: Dangerous new server status for deleted files","fromName":"Johan Herland","fromEmail":"johan@herland.net","sentAt":"2010-01-21T00:28:13Z","receivedAt":"2010-01-21T00:28:13Z","isPatch":false,"sender":{"key":"johan@herland.net","avatar":"https://avatars.githubusercontent.com/u/547031?v=4"},"body":"On Wednesday 20 January 2010, Pal-Kristian Engstad wrote:\n> Our new Perforce server (P4D/NTX64/2009.2/228098 2009/12/16) seems to be\n> giving out 'move/delete' instead of the old 'delete' status for files\n> that are moved within the repo. Attached is the simple patch to fix it.\n> (By the way: How do you \"sign off\" a patch?) This is urgent, as it will\n> corrupt git repos trying to track a Perforce depot.\n\nHi, and welcome to the Git community.\n\nThe patch itself may be fine, but you should probably read \nDocumentation/SubmittingPatches for hints on the customs of this list. For \nexample: We prefer patches _inline_ in the mail, so that it's easier to \nreview and comment on them. The Documentation/SubmittingPatches also \nexplains what is meant by a sign-off, and how to sign-off your patches.\n\n\nHave fun! :)\n\n...Johan\n\n-- \nJohan Herland, <johan@herland.net>\nwww.herland.net\n"}]}