diff options
| author |  Simon Hausmann <simon@lst.de> | 2007-08-26 17:36:55 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-09-03 20:35:39 +0200 |
| commit | 1ca3d71069620f1438d9f89165a3e69e8d47d302 (patch) | |
| tree | 88bcc016e551679a391ea7d31fa442bfe767790b /contrib/examples/git-resolve.sh | |
| parent | git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ... (diff) | |
| download | tgif-1ca3d71069620f1438d9f89165a3e69e8d47d302.tar.xz | |
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>
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions