Hi, If you have p4 files with 'ktext' enabled, it will expand RCS keywords. Here is how it goes wrong. 1. Clone from p4 with files of 'ktext' type 2. git-p4, converts "$Id:........" to "$Id$" 3. So, the file in p4 and git are different as RCS keywords are modified 4. You locally edit and commit into git a p4 file of type 'ktext' 5. The change history in your local git commit will not have any hunks to track the RCS keyword as they are not modified locally 6. Someone edits the same file on p4 and submits 7. you do a git rebase (which pulls in the new modifications and strips the RCS keyword change, p4 submit would have incremented the $Id:....$) 8. The git diffs is now not aware of the change in RCS keyword 9. You try to submit your local changes back to p4 10. Applying your local changes as patch sets will fail with missing hunks tracking RCS keyword changes I have personally experienced more often and hence decided to dig into git-p4 and fix it. All C/C++ source code is created in our p4 repo as 'ktext' and I keep stumbling on this very often. Ideally, if they were just 'text' type in p4, I would never have seen this problem. -dhruva PS: Simon Hausmann, I missed adding you in CC of the patch as my .gitconfig was still under stablizing. I apologize for that. I have finally set up my ..gitconfig with 'git-p4' identity to add you in loop when I submit. ----- Original Message ---- > From: David Brown <git@xxxxxxxxxx> > To: Dhruva Krishnamurthy <dhruva@xxxxxxxxx> > Cc: GIT SCM <git@xxxxxxxxxxxxxxxx>; Junio C Hamano <gitster@xxxxxxxxx> > Sent: Monday, 15 September, 2008 11:39:55 AM > Subject: Re: [PATCH] Optional shrinking of RCS keywords in git-p4 > > On Mon, Sep 15, 2008 at 11:28:51AM +0530, Dhruva Krishnamurthy wrote: > > >Modifying RCS keywords prevents submitting to p4 from git due to missing hunks. > >New option git-p4.kwstrip set to true or false controls the behavior. > > I'm a little curious about what the problem here is. I've been > stripping keywords out of P4 and submitting changes for many years, > and never had a problem. > > I'm just wondering if we're not fixing the wrong problem here. > > David > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html Connect with friends all over the world. Get Yahoo! India Messenger at http://in.messenger.yahoo.com/?wm=n/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
