git/fast-import at cdcefbc971d8fcdd293750af7571d4c715f86964 - git

Tree: cdcefbc971

Chris Pettitt d9a5f25b67 git-p4 support for perforce renames. The current git-p4 implementation does support file renames. However, because it does not use the "p4 integrate" command, the history for the renamed file is not linked to the new file. This changeset adds support for perforce renames with the integrate command. Currently this feature is only enabled when calling git-p4 submit with the -M option. This is intended to look and behave similar to the "detect renames" feature of other git commands. The following sequence is used for renamed files: p4 integrate -Dt x x' p4 edit x' rm x' git apply p4 delete x By default, perforce will not allow an integration with a target file that has been deleted. That is, if x' in the example above is the name of a previously deleted file then perforce will fail the integrate. The -Dt option tells perforce to allow the target of integrate to be a previously deleted file. Signed-off-by: Chris Pettitt <cpettitt@gmail.com> Signed-off-by: Simon Hausmann <simon@lst.de>		17 years ago
..
git-import.perl	…
git-import.sh	…
git-p4	git-p4 support for perforce renames.	17 years ago
git-p4.bat	…
git-p4.txt	…
import-tars.perl	…