]> git.ipfire.org Git - thirdparty/git.git/commit - git-p4.py
git-p4: Added support for automatically importing newly appearing perforce branches.
authorSimon Hausmann <simon@lst.de>
Sun, 26 Aug 2007 15:36:55 +0000 (17:36 +0200)
committerSimon Hausmann <simon@lst.de>
Mon, 3 Sep 2007 18:35:39 +0000 (20:35 +0200)
commit1ca3d71069620f1438d9f89165a3e69e8d47d302
tree88bcc016e551679a391ea7d31fa442bfe767790b
parent8134f69c21ff47283d8b3ea3cc5b306727cde256
git-p4: Added support for automatically importing newly appearing perforce branches.

If a change in a p4 "branch" appears that hasn't seen any previous commit and
that has a known branch mapping we now try to import it properly. First we
find the p4 change of the source branch that the new p4 branch is based on. Then
we using git rev-list --bisect to locate the corresponding git commit to that change.
Finally we import all changes in the new p4 branch up to the current change and resume
with the regular import.

Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/git-p4