At work, development uses perforce to handle code sharing. I won't say "revision control", because we aren't allowed to check
in changes until they are ready for regression testing.
In order to get my personal change sets under revision control, I've been given the go-ahead to build my own git and initialize the client view of the perforce depot as a git repo.
There are some difficulties
in doing this, however.
The client view lives
in a subfolder of ~, (~/p4), and I want to put ~ under revision control as well, with its own separate history. I can't figure out how to keep the history for ~ separate from ~/p4 without using a submodule. The problem with a submodule is that it looks like I have to go make a repository that will become the submodule and then git submodule add <repo> <path>. But there is nowhere to make the submodule's repository except
in ~. There seems to be no safe place to create the initial client view of the depot with git p4 clone.
(I'm working off of the assumption that initing or cloning a repo into a subdirectory of a git repo is not supported. At least, I can find nothing authoritative on nested git repos.)
edit: Is merely ignoring ~/p4
in the repo rooted at ~ enough to allow me to init a nested repo
in ~/p4? My __git_ps1 function still thinks I'm
in a git repository when I visit an ignored subdirectory of a git repo, so I'm inclined to think not.
I need the "remote" repository created by git p4 sync to be a branch
in ~/p4. We are required to keep all of our code
in ~/p4 so that it doesn't get backed up. Can I pull from a "remote" branch that is really a local branch?
This one is just for convenience, but I thought I could learn something by asking it. For 99% of the project, I just want to start the with the p4
head revision as the inital commit object. For the other 1%, I would like to suck down the entire p4 history so that I can browse it
in git. IOW, after I'm done initalizing it, the initial commit of remotes/p4/master branch will contain:
revision 1 of //depot/prod/Foo/Bar/*
revision X of other files
in //depot/prod/*, where X is the
head revision
and the remotes/p4/master branch contains Y commits, where Y is the number of changelists that had a file
in //depot/prod/Foo/Bar/*, with each commit
in the history corresponding to one of those p4 changelists, and
HEAD looking like p4's
head.
