From: Grant Limberg Date: Mon, 23 May 2011 03:27:48 GMT Subject: Re: [git-p4] Trouble importing all perforce branches into git repository Message-ID: <398FA881-E4A1-49AC-80F2-2D46E9F2ABB9@gmail.com> In-Reply-To: <20110522114917.GA19927@arf.padd.com> On May 22, 2011, at 4:49 AM, Pete Wyckoff wrote: > glimberg@gmail.com wrote on Thu, 19 May 2011 19:32 +0000: >> [git-p4 automatic branch detection] >>> git p4 clone --verbose --detect-branches --max-changes=100 //project/...@all > > I worry that --max-changes prevents it from pulling in the > ref for Branch-foo, and this confuses the automatic branch > detection that assumes it has all its parents. > > It would certainly be more reliable if you did "git-p4 sync > --branch foo //project/foo@all" for each branch you care about. > > Vitor has some modifications to auto-branch detection that might > be useful, or maybe some thoughts as to what's going on. > > -- Pete > > (Vitor: full mail is here: > http://article.gmane.org/gmane.comp.version-control.git/173996/ ) > Removing --max-changes=100 has no effect on the crash I'm experiencing. Same crash still happens on the very first imported commit. If i do "git-p4 sync --branch foo //project/foo@all" for each branch, does that convert 'p4 integrate' commands into git merges? I"m trying to keep all history intact when importing from p4 into git. Thanks, -Grant