{"thread":{"id":"15530","subject":"Re: [PATCH] Optional shrinking of RCS keywords in git-p4","startedAt":"2008-09-15T07:21:08Z","lastAt":"2008-09-15T07:21:08Z","messageCount":1,"participants":["dhruva"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"90717","messageId":"577436.59080.qm@web95004.mail.in2.yahoo.com","threadId":"15530","inReplyTo":null,"subject":"Re: [PATCH] Optional shrinking of RCS keywords in git-p4","fromName":"dhruva","fromEmail":"dhruva@ymail.com","sentAt":"2008-09-15T07:21:08Z","receivedAt":"2008-09-15T07:21:08Z","isPatch":true,"sender":{"key":"dhruva@ymail.com","avatar":null},"body":"Hello,\n\n\n\n----- Original Message ----\n> From: David Brown <git@davidb.org>\n> To: dhruva <dhruva@ymail.com>\n> Cc: GIT SCM <git@vger.kernel.org>; Junio C Hamano <gitster@pobox.com>; Simon Hausmann <simon@lst.de>\n> Sent: Monday, 15 September, 2008 12:05:21 PM\n> Subject: Re: [PATCH] Optional shrinking of RCS keywords in git-p4\n> \n> On Mon, Sep 15, 2008 at 11:56:22AM +0530, dhruva wrote:\n> \n> >8. The git diffs is now not aware of the change in RCS keyword\n> >9. You try to submit your local changes back to p4\n> >10. Applying your local changes as patch sets will fail with missing hunks \n> tracking RCS keyword changes\n> \n> It sounds like you are trying to apply these as patches to a tree\n> which doesn't have RCS headers.  As far as I can tell, P4 completely\n> ignores whatever the $Id: ...$ headers happen to be expanded to at the\n> time of checking.  You can put garbage there, and it check in fine.\n\nI think I now understand this better. If git-p4 is always collapsing the RCS keywords, it should not see it even while it is applying a patch. What bugs me is I got repeated hunk failures during 'git-p4 submit'. It always pointed to RCS keyword. I see it trying 'git-p4' trying to apply the patch and it fails. In the .rej file, I see the expanded RCS keyword (even without my patch that makes it optional). I then started doubting if I had done a 'p4 sync -f' which will bring in files with RCS keywords expanded. If that was the case, git would have found changed files that I have not committed.\n\nI am a bit lost here, I will try to use this for some more time and see if I see such issues (with and without my git-p4 changes).\n\nThanks for making me look deeper!\n\n-dhruva\n\n\n\n      Download prohibited? No problem. CHAT from any browser, without download. Go to http://in.webmessenger.yahoo.com/\n"}]}