From: Govind Salinas Date: Fri, 10 Aug 2007 15:17:04 GMT Subject: Re: git-p4 question Message-ID: <69b0c0350708100817u58f74acbyed5c19830cb92ed7@mail.gmail.com> In-Reply-To: <81b0412b0708100110w6ff90215gd5c367fb65e2ae21@mail.gmail.com> I am having some problems running the script. It seems that (line 1425) $f->{sha1} is uninitialized and causing the import to fail (the perforce path is missing the leading "//" I don't know if that is intentional). Let me know if you want to continue this off list since it isn't really a part of git. On 8/10/07, Alex Riesen wrote: > On 8/10/07, Alex Riesen wrote: > > On 8/10/07, Govind Salinas wrote: > > > If I can just sync from p4 and then sync my binary share and THEN tell > > > git-p4 that //depot/my/product/... maps to c:\path\src\realworkhere, > > > get it to import history etc, then I would be set. > > > > git-p4-import.bat can import a state from the client have-list, > > but it does not import the history. It can import the history > > separately, so that you can stitch it into a merge which will be > > the state imported from the client. Complicated, but I couldn't > > bring myself to figure out the history automatically. > > Err, example: > > Import a state from p4 client: > > git-p4-import -y -c client-name -e > > Import p4 history of a path mapping: > > git-p4-import --p4-path //perforce/path \ > --local-path very-local-path \ > --p4-range '@1234,5678' \ > --start start-commit \ > --branch branch-name > > The last argument (--branch) is optional, will just store the last imported > commit there. start-commit will be assumed current HEAD, if omitted. >