Re: git to p4 conversion

From: Endre Czirbesz <endre@czirbesz.hu>
Date: Feb 4, 2011, 10:49 UTC
Message-ID: <AANLkTimrwUxNOAnfxgvReGN+-h4_0jhZ731y22TB6u1K@mail.gmail.com>
In-Reply-To: <AANLkTikfGapDfZtD9H10797Ted_Av78WD8M7XrACOCpW@mail.gmail.com>

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

Show 11 quoted lines

> 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 (I got a warning from fetch, that there are no common commits, but I supposed that it is right. :) )

> $ 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. :)

Regards,

Endre