Re: [PATCH] Optional shrinking of RCS keywords in git-p4
- From
Tor Arvid Lund <torarvid@gmail.com>
- Date
- Sep 15, 2008, 15:27 UTC
- Message-ID
- <1a6be5fa0809150827y6d52e240m24fd463549bd4971@mail.gmail.com>
- In-Reply-To
- <263224.61965.qm@web95002.mail.in2.yahoo.com>
On Mon, Sep 15, 2008 at 1:46 PM, dhruva <dhruva@ymail.com> wrote:
> ----- Original Message ---- >> From: Tor Arvid Lund <torarvid@gmail.com>
------ >8 ------
Show 8 quoted lines
>> 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 <depotpath>/..." in that folder before applying the patch. So those files are whatever p4 says they are - which is with keywords expanded...
-TAL-