From: Tor Arvid Lund Date: Mon, 15 Sep 2008 11:02:32 GMT Subject: Re: [PATCH] Optional shrinking of RCS keywords in git-p4 Message-ID: <1a6be5fa0809150402m6020698ci9204109a0b615c1c@mail.gmail.com> In-Reply-To: <7vy71tetvt.fsf@gitster.siamese.dyndns.org> On Mon, Sep 15, 2008 at 9:43 AM, Junio C Hamano wrote: > David Brown writes: > >> ... As far as I can tell, P4 completely >> ignores whatever the $Id: ...$ headers happen to be expanded to at the >> time of checking. You can put garbage there, and it check in fine. >> ... >> I guess it isn't a problem to make this optional in git-p4, but I >> don't think this patch is solving the right problem. > > Hmm. I do not do p4, but what I am guessing is that there probably is a > configuration switch on the p4 side that lets you check in files with > "$Id: garbage $" in them, while dhruva hasn't turned that switch on. 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... -Tor Arvid Lund-