From: Tor Arvid Lund <torarvid@gmail.com>
Date: Fri, 04 Feb 2011 14:01:26 GMT
Subject: Re: git to p4 conversion
Message-ID: <AANLkTi=_spLE-KMnou-2LLQjwq4FUZxNr9pk7D9C=4PK@mail.gmail.com>
In-Reply-To: <AANLkTimrwUxNOAnfxgvReGN+-h4_0jhZ731y22TB6u1K@mail.gmail.com>

On Fri, Feb 4, 2011 at 11:49 AM, Endre Czirbesz <endre@czirbesz.hu> wrote:
> Hi All,
>
> Thanks for the replies.
>
> 2011/2/4 Tor Arvid Lund <torarvid@gmail.com>:
>> On Fri, Feb 4, 2011 at 1:03 AM, Vitor Antunes <vitor.hda@gmail.com> wrote:
>>> git remote add remotename myprojectrepo
>
>> Endre, you should start like you already have; by git-p4 cloning your
>> project from perforce. (You maybe want to have a dummy file checked in
>> to your <projectdir> in perforce, so that the 'git-p4 clone' command
>> produces at least one commit in your git repo)...
>>
>> Then, do 'git remote add tempremote <path-to-your-existing-git-repo>'
>> like Vitor suggests.
>>
>> At this point I would do:
>>
>> $ git checkout -b tempbranch tempremote/master
> At this point I got an error message:
> fatal: git checkout: updating paths is incompatible with switching branches.
>
> So I fetched my tempremote first:
> $ git fetch tempremote
> $ git checkout -b tempbranch tempremote/master

See, this is what happens when I write a "how-to" and not actually try
it out before sending it... Obviously, you are correct in that you
have to fetch it before being able to check it out :-)

> (I got a warning from fetch, that there are no common commits, but I
> supposed that it is right. :) )

That is correct.

>> $ git rebase master
> It applied all my commits.
>
>> $ git-p4 submit
>  Synchronizing p4 checkout...
>  ... - file(s) up-to-date.
>  Applying 1##############################9 Initial commit
>  error: ***: already exists in working directory
> [...]
>  Unfortunately applying the change failed!
>
> It said this error for all my files. :(
> But I think we are almost there. :)

Again, if only I'd tried it myself first! ;)

Well, I can get it to work if I do:
$ git p4 sync

before the 'git p4 submit'.

Try that, and see if it works for you. (BTW, when committing
half-works, and then fails, oftentimes you need to do a bit of cleanup
in perforce... Revert files, manually remove files created by git
inside your p4 clientspec root directory, that sort of thing...)

    -- Tor Arvid