Re: git-p4 and keyword expansion

Hi,

On Mon, Sep 8, 2008 at 6:25 AM, dhruva [off-list ref] wrote:

Hi,
 The git-p4 script unexpands all p4 keywords before feeding it to git fastimport. When there is a new version, it records only the diffs minus the keyword contents at it unexpands and then feeds to fastimport. When trying to submit back to perforce, applying a patch on top of the latest file in p4 with the keyword expanded fails because we have not tracked that difference. Patch applying fails and expects you to manually (out of git) to do a 'p4 submit' and get back and do 'git-p4 submit --continue'.
 Removing the keyword unexpanding code in 'git-p4' with the following patch makes it work:

Yes, I have also experienced this problem, and haven't yet come up
with a solution to it. Your solution seems to solve the problem with
submitting to p4, but it would also mean that files cloned from p4
would have diffs in the git database whenever the p4 headers changed.
This does not seem nice to me. Are all the keyword expansions
reproducable? I mean... could we store them in git as before
(unexpanded), and make some logic to recreate them upon submitting to
p4? That might work...

I think, at least, that although this is a nice initiative, we should
find a nicer solution.

-Tor Arvid-