{"thread":{"id":"29575","subject":"git p4 submit bugs (submit fails due to keyword expansion mismatch and gives bad instructions for how to proceed)","startedAt":"2012-02-08T21:49:50Z","lastAt":"2012-02-08T22:27:29Z","messageCount":2,"participants":["Eric Scouten","Luke Diamand"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"184204","messageId":"CAEe=O8o-BG0xNGQEweezPu8cj+Brt1Km_anhEJBg0W7Q=rLbkw@mail.gmail.com","threadId":"29575","inReplyTo":null,"subject":"git p4 submit bugs (submit fails due to keyword expansion mismatch and gives bad instructions for how to proceed)","fromName":"Eric Scouten","fromEmail":"eric@scouten.com","sentAt":"2012-02-08T21:49:50Z","receivedAt":"2012-02-08T21:49:50Z","isPatch":false,"sender":{"key":"eric@scouten.com","avatar":"https://gravatar.com/avatar/2f15dca16692989615c8c7f83e7a06bb25bc3121425c8ba2998b93868eb01aa2?d=mp&s=160"},"body":"I've been experimenting with git-p4 as a front-end to Perforce as\ndescribed in http://www.perforce.com/blog/120113/git-perforce-client,\nbut two bugs are causing me major headaches:\n\n(1) git-p4 doesn't work with P4 keyword expansion. (I gather there's a\nfork of git-p4 that makes it work, but the current official distro\ndoesn't.) This can lead to some ugly failed submits down the road.\nWhich leads me to ...\n\n(2) When a git p4 submit fails, the error message for how to resolve\nit is bogus. The instructions say \"Please resolve and submit the\nconflict manually and continue afterwards with git-p4 submit\n--continue\", but when I do that, I get:\n\n$ git p4 submit --continue\nUsage: git-p4 submit [options] [name of git branch to submit into\nperforce depot]\ngit-p4: error: no such option: --continue\n\nUgh.\n\n(P.S. If there's a better place to post bug reports, etc., please\ninform. Thanks.)\n\n-Eric\n"},{"id":"184209","messageId":"4F32F6D1.8030009@diamand.org","threadId":"29575","inReplyTo":"CAEe=O8o-BG0xNGQEweezPu8cj+Brt1Km_anhEJBg0W7Q=rLbkw@mail.gmail.com","subject":"Re: git p4 submit bugs (submit fails due to keyword expansion mismatch and gives bad instructions for how to proceed)","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2012-02-08T22:27:29Z","receivedAt":"2012-02-08T22:27:29Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"On 08/02/12 21:49, Eric Scouten wrote:\n> I've been experimenting with git-p4 as a front-end to Perforce as\n> described in http://www.perforce.com/blog/120113/git-perforce-client,\n> but two bugs are causing me major headaches:\n>\n> (1) git-p4 doesn't work with P4 keyword expansion. (I gather there's a\n> fork of git-p4 that makes it work, but the current official distro\n> doesn't.) This can lead to some ugly failed submits down the road.\n> Which leads me to ...\n\nDo you mean those awful $RCS$ keywords?\n\nI had a go at creating some code that would cope, but in the end I'm \nafraid I gave up.\n\nMy strategy was to try the patch, if it failed, look for RCS keywords, \nand then zap them in the destination p4 file and then try the patch again.\n\nIt worked for some cases reasonably well (deletion is a bit trickier), \nbut it failed horribly if anyone was crazy enough to copy a p4 file with \nexpanded RCS keywords into the git repo. So at that point, I gave up in \ndisgust and just wrote a pre-commit script to reject all changes \ninvolving $RCS$.\n\nBasically, my feeling now is that RCS keywords are utterly bonkers, and \nanyone stupid enough to use them has probably got bigger problems than \njust git-p4 - I hope that's not you though :-)\n\n>\n> (2) When a git p4 submit fails, the error message for how to resolve\n> it is bogus. The instructions say \"Please resolve and submit the\n> conflict manually and continue afterwards with git-p4 submit\n> --continue\", but when I do that, I get:\n>\n> $ git p4 submit --continue\n> Usage: git-p4 submit [options] [name of git branch to submit into\n> perforce depot]\n> git-p4: error: no such option: --continue\n\nYes, that _is_ annoying.\n\n>\n> Ugh.\n>\n> (P.S. If there's a better place to post bug reports, etc., please\n> inform. Thanks.)\n>\n> -Eric\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"}]}