author | Pal-Kristian Engstad <pal_engstad@naughtydog.com> | |
Fri, 22 Jan 2010 02:33:00 +0000 (18:33 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 1 Feb 2010 20:08:14 +0000 (12:08 -0800) | ||
commit | 562d53fa69933b3ade2691b99cbe67722313f43c | |
tree | eb4ef1ec1f684a5a2dd5ee76533c877e14f471a3 | tree | snapshot |
parent | 8d9e7d5293d6a8b50c9e0eb8e23ef5fed45c86d0 | commit | diff |
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>
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>
contrib/fast-import/git-p4 | diff | blob | history |