diff options
| author | Pal-Kristian Engstad <pal_engstad@naughtydog.com> | 2010-01-21 18:33:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-01 12:08:14 -0800 |
| commit | 562d53fa69933b3ade2691b99cbe67722313f43c (patch) | |
| tree | eb4ef1ec1f684a5a2dd5ee76533c877e14f471a3 /contrib | |
| parent | 8d9e7d5293d6a8b50c9e0eb8e23ef5fed45c86d0 (diff) | |
| download | git-562d53fa69933b3ade2691b99cbe67722313f43c.tar.gz git-562d53fa69933b3ade2691b99cbe67722313f43c.tar.xz | |
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: Pal-Kristian Engstad <pal_engstad@naughtydog.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | 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 d1512e0ac..e7c48144e 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) |