Hi,
Nice to see some traction in this area, motivates me to work harder to solve this problem.
----- Original Message ----
Show 25 quoted lines
> From: Tor Arvid Lund <torarvid@gmail.com>
> To: dhruva <dhruva@ymail.com>
> Cc: Git Mailing List <git@vger.kernel.org>
> Sent: Monday, 8 September, 2008 2:07:05 PM
> Subject: Re: git-p4 and keyword expansion
>
> 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:
> >> 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... :-/
>
I was drafting my reply and saw your response. The only area I am not sure it git-p4 handles is a rename/copy of an existing file. If that depends on heuristics based on diff, that might fail due to keyword expansions. I will look closer into the git-p4 script today.
-dhruva
Get an email ID as yourname@ymail.com or yourname@rocketmail..com. Click here http://in.promos.yahoo.com/address