From: "Tor Arvid Lund" <torarvid@gmail.com>
To: dhruva <dhruva@ymail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: git-p4 and keyword expansion
Date: Mon, 8 Sep 2008 10:37:05 +0200 [thread overview]
Message-ID: <1a6be5fa0809080137r622e9492ob72b6d2239311631@mail.gmail.com> (raw)
In-Reply-To: <1a6be5fa0809080127h5db71093o364aade2fb955acc@mail.gmail.com>
On Mon, Sep 8, 2008 at 10:27 AM, Tor Arvid Lund <torarvid@gmail.com> wrote:
> Hi,
>
> On Mon, Sep 8, 2008 at 6:25 AM, dhruva <dhruva@ymail.com> 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-
next prev parent reply other threads:[~2008-09-08 8:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-08 4:25 git-p4 and keyword expansion dhruva
2008-09-08 8:27 ` Tor Arvid Lund
2008-09-08 8:37 ` Tor Arvid Lund [this message]
2008-09-08 21:39 ` Jing Xue
-- strict thread matches above, loose matches on Subject: below --
2008-09-08 8:50 dhruva
2008-09-09 11:14 dhruva
2008-09-09 17:38 Jing Xue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1a6be5fa0809080137r622e9492ob72b6d2239311631@mail.gmail.com \
--to=torarvid@gmail.com \
--cc=dhruva@ymail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).