From: Tor Arvid Lund Date: Mon, 08 Sep 2008 08:37:05 GMT Subject: Re: git-p4 and keyword expansion Message-ID: <1a6be5fa0809080137r622e9492ob72b6d2239311631@mail.gmail.com> In-Reply-To: <1a6be5fa0809080127h5db71093o364aade2fb955acc@mail.gmail.com> On Mon, Sep 8, 2008 at 10:27 AM, Tor Arvid Lund wrote: > Hi, > > On Mon, Sep 8, 2008 at 6:25 AM, dhruva 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. Hmm... Now that I think about it... Maybe we _want_ the extra diff hunks... Personally I don't care much for the keyword expansions, but since they're there in p4, and p4 diff shows a diff hunk there, maybe we should just do the same. In which case your original patch might be just fine. I realise I haven't had my morning coffee yet. Me confused... :-/ -TA-