From: tumik Date: Thu, 16 Jun 2011 08:28:26 GMT Subject: Re: [git-p4] Trouble importing all perforce branches into git repository Message-ID: <1308212906486-6482174.post@n2.nabble.com> In-Reply-To: <0AC6DD14-3042-4A18-91AC-1CE77D8B4CD2@gmail.com> Grant Limberg wrote: > > I think I just figured out the problem. The branch mapping between > //project/MAIN/... and //project/Branch-foo/... was done backwards, thus > git-p4 was expecting Branch-foo to be a parent of MAIN when the inverse > was actually true. > Did you get it working so that the branch integrates at Perforce show up as merges in git? I have been trying to do this for tens of hours now and just can't get it working.. I have tried making the branch mapping both ways, and even both at the same time but with no success. I have succesfully imported the two testing branches to git, but if I look at it in gitk for example, the history is linear and there are no merges from the other branch (it shows up as a normal commit, without the parent from other branch, just adding all lines that the merging did). in p4v it shows up as it should! -- View this message in context: http://git.661346.n2.nabble.com/git-p4-Trouble-importing-all-perforce-branches-into-git-repository-tp6383422p6482174.html Sent from the git mailing list archive at Nabble.com.