git-p4 - workflow suggestions
- From
- Kaizer H. Sogiawala <kaizers@gmail.com>
- Date
- Feb 4, 2011, 00:23 UTC
- Message-ID
- <AANLkTik3iFXZE6KSvSSgka3rJyCQbPXpUrTWRGyonfT=@mail.gmail.com>
Hi,
We are primarily a Perforce shop. I am looking for a git-p4 workflow that will alllow a sub-team (2-20 developers) to use git as their primary source control repository. This sub-team is tasked with refactoring and will need heavy-duty branch/merge support. The main/central source code repository (and branch) is in Perforce.
I am looking at approaches that will allow me to "git-p4 clone" from Perforce (a branch in perforce, say trunk) into a bare/shared git repository. This repository is then cloned by each developer of the git-sub-team to perform regular development/push/pull/merge/rebase activities.
Periodically, a gatekeeper would pull changes from Perforce to git and push changes from git to Perforce. Can this be done?
So far, I have looked at the: - git-p4 documentation - Version Control with Git book By: Jon Loeliger (particularly the git-svn section) - Mailing list (particularly following thread answered by Tor Arvid Lund) - googl'n around this topic
Most discussion is around how to use git-p4 as a sync mechanism for a single user. When I attempt to git-p4 clone (import) and then create a shared/bare repository out of it and emulating multiple user, the git-p4 sync mechanism breaks down after couple of merges. The git-p4 sync/rebase/submit will try to reapply duplicate changes and trip pretty early in the cycle.
If you have a working model of making available a p4 branch for a sub-team using git-p4, I would really appreciate a writeup or blog. Thanks in advance.
-- Kaizer