Re: [PATCH] Optional shrinking of RCS keywords in git-p4

Hello,



----- Original Message ----

From: David Brown <redacted>
To: dhruva <redacted>
Cc: GIT SCM <redacted>; Junio C Hamano <redacted>; Simon Hausmann <redacted>
Sent: Monday, 15 September, 2008 12:05:21 PM
Subject: Re: [PATCH] Optional shrinking of RCS keywords in git-p4

On Mon, Sep 15, 2008 at 11:56:22AM +0530, dhruva wrote:

quoted

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

It sounds like you are trying to apply these as patches to a tree
which doesn't have RCS headers.  As far as I can tell, P4 completely
ignores whatever the $Id: ...$ headers happen to be expanded to at the
time of checking.  You can put garbage there, and it check in fine.

I 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.

I 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).

Thanks for making me look deeper!

-dhruva



      Download prohibited? No problem. CHAT from any browser, without download. Go to http://in.webmessenger.yahoo.com/