{"thread":{"id":"26399","subject":"git to p4 conversion","startedAt":"2011-02-03T13:52:33Z","lastAt":"2011-02-07T15:07:45Z","messageCount":14,"participants":["Endre Czirbesz","Ian Wienand","Vitor Antunes","Tor Arvid Lund"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"160326","messageId":"AANLkTi=0TSD6p7WtsVzx=pq8=GVu+jHUdxt1bnC++CT+@mail.gmail.com","threadId":"26399","inReplyTo":null,"subject":"git to p4 conversion","fromName":"Endre Czirbesz","fromEmail":"endre@czirbesz.hu","sentAt":"2011-02-03T13:52:33Z","receivedAt":"2011-02-03T13:52:33Z","isPatch":false,"sender":{"key":"endre@czirbesz.hu","avatar":"https://gravatar.com/avatar/15fc76b943867dd0eda18c7eef600ac0d8a688b4e718830692beabf6d2d6615b?d=mp&s=160"},"body":"Hi,\n\nMy company is introducing perforce, and the policy is that all source\ncodes should be kept there.\n\nI have some small (and flat) git repos, which I would like to migrate\ninto a perforce depot keeping their histories. I tried git-p4 without\nany success, and I did not find a good manual for it.\n\nIs there any step-by-step tutorial out there? Is there any living human\nwho ever made a successful conversion in this direction?\n\nThanks for your help in advance.\n\nEndre Czirbesz\n"},{"id":"160342","messageId":"4D4AF29E.7070509@vmware.com","threadId":"26399","inReplyTo":"AANLkTi=0TSD6p7WtsVzx=pq8=GVu+jHUdxt1bnC++CT+@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Ian Wienand","fromEmail":"ianw@vmware.com","sentAt":"2011-02-03T18:23:26Z","receivedAt":"2011-02-03T18:23:26Z","isPatch":false,"sender":{"key":"ianw@vmware.com","avatar":null},"body":"On 03/02/11 05:52, Endre Czirbesz wrote:\n> I have some small (and flat) git repos, which I would like to migrate\n> into a perforce depot keeping their histories. I tried git-p4 without\n> any success, and I did not find a good manual for it.\n\nWhat exactly did you try?\n\nTheoretically, you could clone your new, empty, company-mandated p4\ntree into a fresh git repo, get your existing code onto a new branch\nin this fresh repo (it's already in git, right, so that should be\neasy), then use 'git-p4 submit' to submit that branch back to p4.\n\n> Is there any step-by-step tutorial out there? Is there any living human\n> who ever made a successful conversion in this direction?\n\nI'm not aware of an existing tutorial for this, sorry\n\n-i\n"},{"id":"160345","messageId":"AANLkTikW_sU8oCmU9wN5q1OPPJrQbS2YZAvS0C_nBQbD@mail.gmail.com","threadId":"26399","inReplyTo":"4D4AF29E.7070509@vmware.com","subject":"Re: git to p4 conversion","fromName":"Endre Czirbesz","fromEmail":"endre@czirbesz.hu","sentAt":"2011-02-03T19:50:28Z","receivedAt":"2011-02-03T19:50:28Z","isPatch":false,"sender":{"key":"endre@czirbesz.hu","avatar":"https://gravatar.com/avatar/15fc76b943867dd0eda18c7eef600ac0d8a688b4e718830692beabf6d2d6615b?d=mp&s=160"},"body":"Hello Ian,\n\nThanks for your reply.\n\n2011/2/3 Ian Wienand :\n> What exactly did you try?\nI am not at my work computer now, but as I remember:\n\ncd workdir\ngit-p4 clone //depot/projectdir/...@all .\ngit clone myprojectrepo .\n\n(Everything went fine till this point.)\n\ngit-p4 sync\ngit-p4 submit\nFatal error...\n\nI don't remember the exact message, but it tried to reach a\nnon-existing git commit (HEAD~xx, where xx was count of my commits, so\nit tried to refer to a commit before my initial commit).\nI tried to change the order of the clone steps, but the result was the same.\n\nRgds,\n\nEndre\n"},{"id":"160367","messageId":"loom.20110204T004658-497@post.gmane.org","threadId":"26399","inReplyTo":"AANLkTikW_sU8oCmU9wN5q1OPPJrQbS2YZAvS0C_nBQbD@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Vitor Antunes","fromEmail":"vitor.hda@gmail.com","sentAt":"2011-02-04T00:03:33Z","receivedAt":"2011-02-04T00:03:33Z","isPatch":false,"sender":{"key":"vitor.hda@gmail.com","avatar":"https://avatars.githubusercontent.com/u/606876?v=4"},"body":"Hi Endre,\n\nEndre Czirbesz czirbesz.hu> writes:\n\n> \n> Hello Ian,\n> \n> Thanks for your reply.\n> \n> 2011/2/3 Ian Wienand vmware.com>:\n> > What exactly did you try?\n> I am not at my work computer now, but as I remember:\n> \n> cd workdir\n> git-p4 clone //depot/projectdir/...@all .\n> git clone myprojectrepo .\n\nI think what you should do is add the git repository as a remote with something\nlike:\n\ngit remote add remotename myprojectrepo\ngit pull remotename master\ngit p4 submit\n\nHope this helps,\nVitor\n"},{"id":"160383","messageId":"AANLkTikfGapDfZtD9H10797Ted_Av78WD8M7XrACOCpW@mail.gmail.com","threadId":"26399","inReplyTo":"loom.20110204T004658-497@post.gmane.org","subject":"Re: git to p4 conversion","fromName":"Tor Arvid Lund","fromEmail":"torarvid@gmail.com","sentAt":"2011-02-04T09:25:18Z","receivedAt":"2011-02-04T09:25:18Z","isPatch":false,"sender":{"key":"torarvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/439758?v=4"},"body":"[on this mailing list, please don't cull the CC list]\n\nOn Fri, Feb 4, 2011 at 1:03 AM, Vitor Antunes wrote:\n> Hi Endre,\n>\n\n> I think what you should do is add the git repository as a remote with something\n> like:\n>\n> git remote add remotename myprojectrepo\n> git pull remotename master\n> git p4 submit\n\nThat's not what I would do... When I try this, the 'git pull ...'\ncreates a merge, which I don't want to do when using git-p4.\n\nBut I think we're close to something that would work ok:\n\nEndre, you should start like you already have; by git-p4 cloning your\nproject from perforce. (You maybe want to have a dummy file checked in\nto your in perforce, so that the 'git-p4 clone' command\nproduces at least one commit in your git repo)...\n\nThen, do 'git remote add tempremote '\nlike Vitor suggests.\n\nAt this point I would do:\n\n$ git checkout -b tempbranch tempremote/master\n$ git rebase master\n$ git-p4 submit\n\nSo, the 'git rebase master' should be like applying each of your\nexisting git commits *on-top-of* the git-p4 branch that you already\nhave. And that is the key to git-p4 knowing what to push to the\nperforce server.\n\nThus, if I wanted to get all my existing git history into perforce,\nthis is how I would do it.\n\n -- Tor Arvid\n"},{"id":"160388","messageId":"AANLkTimrwUxNOAnfxgvReGN+-h4_0jhZ731y22TB6u1K@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTikfGapDfZtD9H10797Ted_Av78WD8M7XrACOCpW@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Endre Czirbesz","fromEmail":"endre@czirbesz.hu","sentAt":"2011-02-04T10:49:16Z","receivedAt":"2011-02-04T10:49:16Z","isPatch":false,"sender":{"key":"endre@czirbesz.hu","avatar":"https://gravatar.com/avatar/15fc76b943867dd0eda18c7eef600ac0d8a688b4e718830692beabf6d2d6615b?d=mp&s=160"},"body":"Hi All,\n\nThanks for the replies.\n\n2011/2/4 Tor Arvid Lund :\n> On Fri, Feb 4, 2011 at 1:03 AM, Vitor Antunes wrote:\n>> git remote add remotename myprojectrepo\n\n> Endre, you should start like you already have; by git-p4 cloning your\n> project from perforce. (You maybe want to have a dummy file checked in\n> to your in perforce, so that the 'git-p4 clone' command\n> produces at least one commit in your git repo)...\n>\n> Then, do 'git remote add tempremote '\n> like Vitor suggests.\n>\n> At this point I would do:\n>\n> $ git checkout -b tempbranch tempremote/master\nAt this point I got an error message:\nfatal: git checkout: updating paths is incompatible with switching branches.\n\nSo I fetched my tempremote first:\n$ git fetch tempremote\n$ git checkout -b tempbranch tempremote/master\n(I got a warning from fetch, that there are no common commits, but I\nsupposed that it is right. :) )\n\n> $ git rebase master\nIt applied all my commits.\n\n> $ git-p4 submit\n Synchronizing p4 checkout...\n ... - file(s) up-to-date.\n Applying 1##############################9 Initial commit\n error: ***: already exists in working directory\n[...]\n Unfortunately applying the change failed!\n\nIt said this error for all my files. :(\nBut I think we are almost there. :)\n\nRegards,\n\nEndre\n"},{"id":"160396","messageId":"AANLkTi=_spLE-KMnou-2LLQjwq4FUZxNr9pk7D9C=4PK@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTimrwUxNOAnfxgvReGN+-h4_0jhZ731y22TB6u1K@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Tor Arvid Lund","fromEmail":"torarvid@gmail.com","sentAt":"2011-02-04T14:01:26Z","receivedAt":"2011-02-04T14:01:26Z","isPatch":false,"sender":{"key":"torarvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/439758?v=4"},"body":"On Fri, Feb 4, 2011 at 11:49 AM, Endre Czirbesz wrote:\n> Hi All,\n>\n> Thanks for the replies.\n>\n> 2011/2/4 Tor Arvid Lund :\n>> On Fri, Feb 4, 2011 at 1:03 AM, Vitor Antunes wrote:\n>>> git remote add remotename myprojectrepo\n>\n>> Endre, you should start like you already have; by git-p4 cloning your\n>> project from perforce. (You maybe want to have a dummy file checked in\n>> to your in perforce, so that the 'git-p4 clone' command\n>> produces at least one commit in your git repo)...\n>>\n>> Then, do 'git remote add tempremote '\n>> like Vitor suggests.\n>>\n>> At this point I would do:\n>>\n>> $ git checkout -b tempbranch tempremote/master\n> At this point I got an error message:\n> fatal: git checkout: updating paths is incompatible with switching branches.\n>\n> So I fetched my tempremote first:\n> $ git fetch tempremote\n> $ git checkout -b tempbranch tempremote/master\n\nSee, this is what happens when I write a \"how-to\" and not actually try\nit out before sending it... Obviously, you are correct in that you\nhave to fetch it before being able to check it out :-)\n\n> (I got a warning from fetch, that there are no common commits, but I\n> supposed that it is right. :) )\n\nThat is correct.\n\n>> $ git rebase master\n> It applied all my commits.\n>\n>> $ git-p4 submit\n>  Synchronizing p4 checkout...\n>  ... - file(s) up-to-date.\n>  Applying 1##############################9 Initial commit\n>  error: ***: already exists in working directory\n> [...]\n>  Unfortunately applying the change failed!\n>\n> It said this error for all my files. :(\n> But I think we are almost there. :)\n\nAgain, if only I'd tried it myself first! ;)\n\nWell, I can get it to work if I do:\n$ git p4 sync\n\nbefore the 'git p4 submit'.\n\nTry that, and see if it works for you. (BTW, when committing\nhalf-works, and then fails, oftentimes you need to do a bit of cleanup\nin perforce... Revert files, manually remove files created by git\ninside your p4 clientspec root directory, that sort of thing...)\n\n -- Tor Arvid\n"},{"id":"160399","messageId":"AANLkTi=dZdSqcNckyU7Lb2Zj-khfj=Xiyzbv7LSC+zT2@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTi=_spLE-KMnou-2LLQjwq4FUZxNr9pk7D9C=4PK@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Endre Czirbesz","fromEmail":"endre@czirbesz.hu","sentAt":"2011-02-04T16:08:37Z","receivedAt":"2011-02-04T16:08:37Z","isPatch":false,"sender":{"key":"endre@czirbesz.hu","avatar":"https://gravatar.com/avatar/15fc76b943867dd0eda18c7eef600ac0d8a688b4e718830692beabf6d2d6615b?d=mp&s=160"},"body":"2011/2/4 Tor Arvid Lund :\n> Well, I can get it to work if I do:\n> $ git p4 sync\n>\n> before the 'git p4 submit'.\nSame result. :(\n\nMy current workflow is:\n\n$ rm -rf projdir\n$ git-p4 clone //depot/projdir/...@all\n$ cd projdir\n$ git remote add gitremote endre@gitserver/gitrepo.git\n$ git fetch -q gitremote\n$ git checkout -b tempbranch gitremote/master\n$ git rebase -q master\n$ git-p4 sync\n$ git-p4 submit\n\nThe result is still tons of file already exists in working directory messages.\n\n> Try that, and see if it works for you. (BTW, when committing\n> half-works, and then fails, oftentimes you need to do a bit of cleanup\n> in perforce... Revert files, manually remove files created by git\n> inside your p4 clientspec root directory, that sort of thing...)\n\nI dropped the whole directory, and then recreated it, I do not know\nany better 'cleanup'. :)\n\nRgds,\n\nEndre\n"},{"id":"160400","messageId":"AANLkTimJm81V0D8_j3OfZTcEkyn_jd6_QB2nv8T69JBY@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTimGaPQ=hRp+2pvw-hAOg+wp50nvc_sv9jNTay=n@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Endre Czirbesz","fromEmail":"endre@czirbesz.hu","sentAt":"2011-02-04T16:52:05Z","receivedAt":"2011-02-04T16:52:05Z","isPatch":false,"sender":{"key":"endre@czirbesz.hu","avatar":"https://gravatar.com/avatar/15fc76b943867dd0eda18c7eef600ac0d8a688b4e718830692beabf6d2d6615b?d=mp&s=160"},"body":"Hi Vitor,\n\n2011/2/4 Vitor Antunes :\n>> I dropped the whole directory, and then recreated it, I do not know\n>> any better 'cleanup'. :)\n>\n> Which directory did you drop? Was is the git repository or the P4 workspace?\n> You need to clean up the later. Basically, a \"rm -rf\n> path/to/p4_workspace\" and a \"p4 sync -f\" should do the trick :)\n\nIt is almost the same in my case. :)\nMy p4 client root is ~/work/, my project dir is ~/work/projdir (and at\nthe moment this is the only directory within ~/work/), and I dropped\nthe latter.\nAnd then it was created again by git-p4 clone.\n\nI can drop the workspace root, but I do not think it would help.\n\nRegards,\n\nEndre\n"},{"id":"160418","messageId":"AANLkTi=onuZtGWPTYvw_-rKsR6t-R2UquAUPLHAm-TVV@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTimJm81V0D8_j3OfZTcEkyn_jd6_QB2nv8T69JBY@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Tor Arvid Lund","fromEmail":"torarvid@gmail.com","sentAt":"2011-02-05T00:53:08Z","receivedAt":"2011-02-05T00:53:08Z","isPatch":false,"sender":{"key":"torarvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/439758?v=4"},"body":"On Fri, Feb 4, 2011 at 5:52 PM, Endre Czirbesz wrote:\n> Hi Vitor,\n>\n> 2011/2/4 Vitor Antunes :\n>>> I dropped the whole directory, and then recreated it, I do not know\n>>> any better 'cleanup'. :)\n>>\n>> Which directory did you drop? Was is the git repository or the P4 workspace?\n>> You need to clean up the later. Basically, a \"rm -rf\n>> path/to/p4_workspace\" and a \"p4 sync -f\" should do the trick :)\n>\n> It is almost the same in my case. :)\n> My p4 client root is ~/work/, my project dir is ~/work/projdir (and at\n> the moment this is the only directory within ~/work/), and I dropped\n> the latter.\n> And then it was created again by git-p4 clone.\n\nI... wonder if we're maybe talking past one another here...\n\nLet's take a few things from the top, just in case... If we think\nabout the perforce setup (before we start doing any git stuff)... You\nhave a perforce workspace/client-spec, right? That is - a setup that\ntells perforce where you want the files to be placed on your hard\ndrive when you do a standard \"p4 sync\". Let's call it ~/p4root/ and\nlet us say that your project will then be synced by perforce to\n~/p4root/myproj/\n\nWhen you want to do a git-p4 clone, you should definitely be *outside*\nof ~/p4root/ . Let's say we have a ~/gitroot/ as well. So do cd\n~/gitroot/ so that the git-p4 clone will be under ~/gitroot/myproj/ ;\nand then do all the git-p4 stuff (clone, add remote, fetch, rebase,\nsync, submit).\n\nI think Vitors point was that before you do git-p4 submit, you should\nclean - not ~/gitroot/myproj - but ~/p4root/myproj/.\n\nThis is probably not something that you need to do everytime you want\nto submit back to perforce, but since we have had some rounds with\ntrial-and-error with this, we have probably placed some dirty files\ninside the perforce folders... Make sure that you don't have files\nopened in perforce before you sync.\n\nClearer? More confused? Best of luck anyway :)\n\n -- Tor Arvid\n"},{"id":"160419","messageId":"AANLkTimV1aRiEMa2z-H2bOvRa9H6YAyET1=hn+_O0-0u@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTi=onuZtGWPTYvw_-rKsR6t-R2UquAUPLHAm-TVV@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Vitor Antunes","fromEmail":"vitor.hda@gmail.com","sentAt":"2011-02-05T01:11:06Z","receivedAt":"2011-02-05T01:11:06Z","isPatch":false,"sender":{"key":"vitor.hda@gmail.com","avatar":"https://avatars.githubusercontent.com/u/606876?v=4"},"body":"Hi Tor,\n\nOn Sat, Feb 5, 2011 at 12:53 AM, Tor Arvid Lund wrote:\n> I... wonder if we're maybe talking past one another here...\n>\n> Let's take a few things from the top, just in case... If we think\n> about the perforce setup (before we start doing any git stuff)... You\n> have a perforce workspace/client-spec, right? That is - a setup that\n> tells perforce where you want the files to be placed on your hard\n> drive when you do a standard \"p4 sync\". Let's call it ~/p4root/ and\n> let us say that your project will then be synced by perforce to\n> ~/p4root/myproj/\n>\n> When you want to do a git-p4 clone, you should definitely be *outside*\n> of ~/p4root/ . Let's say we have a ~/gitroot/ as well. So do cd\n> ~/gitroot/ so that the git-p4 clone will be under ~/gitroot/myproj/ ;\n> and then do all the git-p4 stuff (clone, add remote, fetch, rebase,\n> sync, submit).\n>\n> I think Vitors point was that before you do git-p4 submit, you should\n> clean - not ~/gitroot/myproj - but ~/p4root/myproj/.\n>\n> This is probably not something that you need to do everytime you want\n> to submit back to perforce, but since we have had some rounds with\n> trial-and-error with this, we have probably placed some dirty files\n> inside the perforce folders... Make sure that you don't have files\n> opened in perforce before you sync.\n>\n> Clearer? More confused? Best of luck anyway :)\n>\n>    -- Tor Arvid\n>\n\nYeah, I think we're in sync here. I'm almost sure your (much more\ndetailed) instructions will solve Endre's problem :)\n\nKind regards,\n-- \nVitor Antunes\n"},{"id":"160607","messageId":"AANLkTimP81rVPwvpaCSgBJiZ2Jm131+Q9E-Fkj0-jZfd@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTimV1aRiEMa2z-H2bOvRa9H6YAyET1=hn+_O0-0u@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Endre Czirbesz","fromEmail":"endre@czirbesz.hu","sentAt":"2011-02-07T13:57:18Z","receivedAt":"2011-02-07T13:57:18Z","isPatch":false,"sender":{"key":"endre@czirbesz.hu","avatar":"https://gravatar.com/avatar/15fc76b943867dd0eda18c7eef600ac0d8a688b4e718830692beabf6d2d6615b?d=mp&s=160"},"body":"Hi,\n\nThanks for your patience and the detailed help.\nI forgot only one thing, that I need two separate directories... :)\n\nSo, after some minor mods in git-p4 (I have some directories with\nspaces, and some files with #@*% in their names), it seems as if it\nworked, my files are in P4 depot, although I got an error message:\n\nFailed to merge in the changes.\nPatch failed at 0001 Initial commit\n\nWhen you have resolved this problem run \"git rebase --continue\".\nIf you would prefer to skip this patch, instead run \"git rebase --skip\".\nTo restore the original branch and stop rebasing run \"git rebase --abort\".\n\nException: command failed: git rebase remotes/p4/master\n\nRegards,\n\nEndre\n"},{"id":"160608","messageId":"AANLkTikCVNoxyNezHVM=8gg6wZNzhV2eOytL952SSP3s@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTimP81rVPwvpaCSgBJiZ2Jm131+Q9E-Fkj0-jZfd@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Tor Arvid Lund","fromEmail":"torarvid@gmail.com","sentAt":"2011-02-07T14:13:03Z","receivedAt":"2011-02-07T14:13:03Z","isPatch":false,"sender":{"key":"torarvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/439758?v=4"},"body":"On Mon, Feb 7, 2011 at 2:57 PM, Endre Czirbesz wrote:\n> Hi,\n>\n> Thanks for your patience and the detailed help.\n> I forgot only one thing, that I need two separate directories... :)\n>\n> So, after some minor mods in git-p4 (I have some directories with\n> spaces, and some files with #@*% in their names), it seems as if it\n> worked, my files are in P4 depot, although I got an error message:\n>\n> Failed to merge in the changes.\n> Patch failed at 0001 Initial commit\n>\n> When you have resolved this problem run \"git rebase --continue\".\n> If you would prefer to skip this patch, instead run \"git rebase --skip\".\n> To restore the original branch and stop rebasing run \"git rebase --abort\".\n>\n> Exception: command failed: git rebase remotes/p4/master\n\nMaybe you could run \"git p4 submit --verbose\"? (the 'verbose' option\nmight give you a clue as to what the underlying problem is)\n\n -- Tor Arvid\n\n> Regards,\n>\n> Endre\n>\n"},{"id":"160610","messageId":"AANLkTi=9vzPH2zrGTvmCLYjgvQJQs=Y+W40Jz8g5FyTS@mail.gmail.com","threadId":"26399","inReplyTo":"AANLkTikCVNoxyNezHVM=8gg6wZNzhV2eOytL952SSP3s@mail.gmail.com","subject":"Re: git to p4 conversion","fromName":"Endre Czirbesz","fromEmail":"endre@czirbesz.hu","sentAt":"2011-02-07T15:07:45Z","receivedAt":"2011-02-07T15:07:45Z","isPatch":false,"sender":{"key":"endre@czirbesz.hu","avatar":"https://gravatar.com/avatar/15fc76b943867dd0eda18c7eef600ac0d8a688b4e718830692beabf6d2d6615b?d=mp&s=160"},"body":"2011/2/7 Tor Arvid Lund :\n> Maybe you could run \"git p4 submit --verbose\"? (the 'verbose' option\n> might give you a clue as to what the underlying problem is)\nI did that actually, just did not want to send the whole output. :)\n\nI will investigate it further, but my boss gave a new highest priority\ntask for me... :(\n\nEndre\n"}]}