Re: git to p4 conversion

From: Tor Arvid Lund <torarvid@gmail.com>
Date: Feb 5, 2011, 00:53 UTC
Message-ID: <AANLkTi=onuZtGWPTYvw_-rKsR6t-R2UquAUPLHAm-TVV@mail.gmail.com>
In-Reply-To: <AANLkTimJm81V0D8_j3OfZTcEkyn_jd6_QB2nv8T69JBY@mail.gmail.com>

On Fri, Feb 4, 2011 at 5:52 PM, Endre Czirbesz <endre@czirbesz.hu> wrote:

Show 15 quoted lines

> Hi Vitor,
>
> 2011/2/4 Vitor Antunes <vitor.hda@gmail.com>:
>>> I dropped the whole directory, and then recreated it, I do not know
>>> any better 'cleanup'. :)
>>
>> Which directory did you drop? Was is the git repository or the P4 workspace?
>> You need to clean up the later. Basically, a "rm -rf
>> path/to/p4_workspace" and a "p4 sync -f" should do the trick :)
>
> It is almost the same in my case. :)
> My p4 client root is ~/work/, my project dir is ~/work/projdir (and at
> the moment this is the only directory within ~/work/), and I dropped
> the latter.
> And then it was created again by git-p4 clone.

I... wonder if we're maybe talking past one another here...

Let's take a few things from the top, just in case... If we think about the perforce setup (before we start doing any git stuff)... You have a perforce workspace/client-spec, right? That is - a setup that tells perforce where you want the files to be placed on your hard drive when you do a standard "p4 sync". Let's call it ~/p4root/ and let us say that your project will then be synced by perforce to ~/p4root/myproj/

When you want to do a git-p4 clone, you should definitely be *outside* of ~/p4root/ . Let's say we have a ~/gitroot/ as well. So do cd ~/gitroot/ so that the git-p4 clone will be under ~/gitroot/myproj/ ; and then do all the git-p4 stuff (clone, add remote, fetch, rebase, sync, submit).

I think Vitors point was that before you do git-p4 submit, you should clean - not ~/gitroot/myproj - but ~/p4root/myproj/.

This is probably not something that you need to do everytime you want to submit back to perforce, but since we have had some rounds with trial-and-error with this, we have probably placed some dirty files inside the perforce folders... Make sure that you don't have files opened in perforce before you sync.

Clearer? More confused? Best of luck anyway :)

    -- Tor Arvid