* [PATCH] git-p4: Fix sync errors due to new server version
@ 2010-01-22 2:33 Pal-Kristian Engstad
0 siblings, 0 replies; only message in thread
From: Pal-Kristian Engstad @ 2010-01-22 2:33 UTC (permalink / raw)
To: Simon Hausmann; +Cc: git
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>
---
contrib/fast-import/git-p4 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 48059d0..1c73e5f 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -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)
--
1.6.5.2.6.gc3c1e.dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-01-22 2:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-22 2:33 [PATCH] git-p4: Fix sync errors due to new server version Pal-Kristian Engstad
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).