You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
77 lines
2.5 KiB
77 lines
2.5 KiB
git-p4 - Perforce <-> Git converter using git-fast-import |
|
|
|
Usage |
|
===== |
|
|
|
git-p4 supports two main modes: Importing from Perforce to a Git repository is |
|
done using "git-p4 sync". Submitting changes from Git back to Perforce is |
|
done using "git-p4 submit". |
|
|
|
Importing |
|
========= |
|
|
|
The procedure is simple: |
|
|
|
mkdir repo-git |
|
cd repo-git |
|
git init |
|
git-p4 sync //path/in/your/perforce/depot |
|
|
|
This will import the current head revision of the specified depot path into a |
|
"p4" branch of your git repository. You can use the --branch=mybranch option |
|
to use a different branch. |
|
|
|
If you want to import the entire history of a given depot path just use |
|
|
|
git-p4 sync //path/in/depot@all |
|
|
|
To achieve optimal compression you may want to run 'git repack -a -d -f' after |
|
a big import. This may take a while. |
|
|
|
Support for Perforce integrations is still work in progress. Don't bother |
|
trying it unless you want to hack on it :) |
|
|
|
|
|
Incremental Imports |
|
=================== |
|
|
|
After an initial import you can easily synchronize your git repository with |
|
newer changes from the Perforce depot by just calling |
|
|
|
git-p4 sync |
|
|
|
in your git repository. |
|
|
|
It is recommended to run 'git repack -a -d -f' from time to time when using |
|
incremental imports to optimally combine the individual git packs that each |
|
incremental import creates through the use of git-fast-import. |
|
|
|
Submitting |
|
========== |
|
|
|
git-p4 has EXPERIMENTAL support for submitting changes from a git repository |
|
back to a Perforce depot. This requires a Perforce checkout separate to your |
|
git repository. All it should take is calling |
|
|
|
git-p4 submit |
|
|
|
in your git repository. This will attempt to locate the perforce checkout |
|
corresponding to your imported depot path. By default the changes between your |
|
current branch and the "p4" branch will be submitted. If there is no "p4" |
|
branch the "origin" branch will be used as reference instead. You can override |
|
this with the --origin=mysourcebranch option. The "origin" branch has to be the |
|
branch populated with git-p4's sync operation. |
|
|
|
After some preparations (which might take a while) git-p4 enters a loop where |
|
it will first show a Perforce submit template and a diff of the change to |
|
apply in the editor. After saving and exiting the editor you will be asked whether |
|
you really want to submit the change or not. |
|
|
|
If a submit fails you may have to "p4 resolve" and submit manually. You can |
|
continue importing the remaining changes with |
|
|
|
git-p4 submit --continue |
|
|
|
After submitting you should sync your perforce import branch ("p4" or "origin") |
|
from Perforce using git-p4's sync command. |
|
|
|
|