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

Hello,



----- Original Message ----

On Mon, Sep 15, 2008 at 1:46 PM, dhruva wrote:

quoted

----- Original Message ----

quoted

From: Tor Arvid Lund 

------ >8 ------

quoted

quoted

Hmm.. I thought this was not a p4 problem. I think however, that
"git-p4 submit" tries to do git format-patch and then git apply that
patch to the p4 directory. In other words, I believe that git apply
fails since the file in the p4 dir has the keywords expanded, while
the patch does not. I haven't done any careful investigation, but If
my assumption is true, it sounds like dhruvas patch should work...

Your assumption is true (from my understanding of the code). My doubt is, even 

the files in p4 folder will be from git with no RCS keyword expanded. The patch 
application must ideally be clean! I am confused here.

Hmm, regarding the p4 folder - I'm pretty sure git-p4 calls "p4 sync
/..." in that folder before applying the patch. So those
files are whatever p4 says they are - which is with keywords
expanded...

I went through the script more closely, you are correct in your analysis. There is a call to 'p4 sync' (around line 797) before applying the commit patches (around line 809). Hence, the current patch would fix this problem of missing hunks with RCS keywords. The other approach of overwriting instead of applying the patch would also work but I feel that is a bit dangerous. It is better to fail if something goes minutely wrong than submit the wrong file (just being a paranoid defensive programmer).

-dhruva



      Get an email ID as yourname@ymail.com or yourname@rocketmail.com. Click here http://in.promos.yahoo.com/address