{"thread":{"id":"32931","subject":"git-p4: Importing a Git repository into Perforce without rebasing","startedAt":"2013-02-19T02:40:45Z","lastAt":"2013-03-04T10:55:52Z","messageCount":3,"participants":["Russell Myers","Thomas Berg","Enrico Weigelt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"209758","messageId":"CAA5tD2sZiYcH+edbuO2Uh43zNUOyDYUO_JHpRhrLOjSqV-PfpA@mail.gmail.com","threadId":"32931","inReplyTo":null,"subject":"git-p4: Importing a Git repository into Perforce without rebasing","fromName":"Russell Myers","fromEmail":"mezner@russellmyers.com","sentAt":"2013-02-19T02:40:45Z","receivedAt":"2013-02-19T02:40:45Z","isPatch":false,"sender":{"key":"mezner@russellmyers.com","avatar":null},"body":"Hello,\n\nI'm trying to take a Git repository which has never been in Perforce\nand push it to Perforce and having difficulty.\n\nIt would appear that git-p4 requires that a repository is cloned using\n\"git p4 clone\" in order to use it to push back to Perforce. That would\nnot be the case here as the repository in question has never been\ntracked by Perforce.\n\nI know that I could create another Git repository that has some\ncommits in it cloned from Perforce and rebase on top of that; however,\nthe repository I'm trying to import is rather large and rebasing would\nrequire me to change many merge commits. I'd like to avoid doing this.\nThe repository has many thousands of commits in it.\n\nIn short my question is this: Using git-p4, is there a way to push a\nGit repository into Perforce without rebasing on top of commits coming\nfrom Perforce?\n\nThanks,\n\nRussell Myers\n"},{"id":"209866","messageId":"CABYiQpnv6U2BVDB0v2Q3ia1x9FmYhNERDpE41TjE2qD5Y9L50A@mail.gmail.com","threadId":"32931","inReplyTo":"CAA5tD2sZiYcH+edbuO2Uh43zNUOyDYUO_JHpRhrLOjSqV-PfpA@mail.gmail.com","subject":"Re: git-p4: Importing a Git repository into Perforce without rebasing","fromName":"Thomas Berg","fromEmail":"merlin66b@gmail.com","sentAt":"2013-02-19T21:29:47Z","receivedAt":"2013-02-19T21:29:47Z","isPatch":false,"sender":{"key":"merlin66b@gmail.com","avatar":null},"body":"Hi,\n\nOn Tue, Feb 19, 2013 at 3:40 AM, Russell Myers <mezner@russellmyers.com> wrote:\n> I'm trying to take a Git repository which has never been in Perforce\n> and push it to Perforce and having difficulty.\n[...]\n> I know that I could create another Git repository that has some\n> commits in it cloned from Perforce and rebase on top of that; however,\n> the repository I'm trying to import is rather large and rebasing would\n> require me to change many merge commits. I'd like to avoid doing this.\n> The repository has many thousands of commits in it.\n\nSo your history is not linear and contains merges.\n\n> In short my question is this: Using git-p4, is there a way to push a\n> Git repository into Perforce without rebasing on top of commits coming\n> from Perforce?\n\nNo, this is not supported. Non-linear history would be a problem for\ngit-p4 too, so that alone wouldn't solve your problem. git-p4 does not\nhave the logic needed to submit merges back to Perforce.\n\n- Thomas\n"},{"id":"210574","messageId":"3727939.1681.1362394552115.JavaMail.root@vnc.biz","threadId":"32931","inReplyTo":"CABYiQpnv6U2BVDB0v2Q3ia1x9FmYhNERDpE41TjE2qD5Y9L50A@mail.gmail.com","subject":"Re: git-p4: Importing a Git repository into Perforce without rebasing","fromName":"Enrico Weigelt","fromEmail":"enrico.weigelt@vnc.biz","sentAt":"2013-03-04T10:55:52Z","receivedAt":"2013-03-04T10:55:52Z","isPatch":false,"sender":{"key":"enrico.weigelt@vnc.biz","avatar":"https://gravatar.com/avatar/15479654ea5be5109582e0713a8ab4bb258846099c516dd320dc686ef70a8a3e?d=mp&s=160"},"body":"Hi,\n\n<snip>\n\nperhaps you should give Perfoce's git-bridge a try.\n\n\ncu\n-- \nMit freundlichen Grüßen / Kind regards \n\nEnrico Weigelt \nVNC - Virtual Network Consult GmbH \nHead Of Development \n\nPariser Platz 4a, D-10117 Berlin\nTel.: +49 (30) 3464615-20\nMobile: +49 (151) 27565287\nFax: +49 (30) 3464615-59\n\nenrico.weigelt@vnc.biz; www.vnc.de \n"}]}