From: Jing Xue Date: Mon, 08 Sep 2008 21:39:00 GMT Subject: Re: git-p4 and keyword expansion Message-ID: <20080908173900.102324atjr5geizo@intranet.digizenstudio.com> In-Reply-To: <554296.48174.qm@web95003.mail.in2.yahoo.com> Quoting dhruva : > 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: I'm not really arguing against the patch itself, but just wondering whether it would be a good idea to make it optional or configurable. IIUC, there are reasons for git to discourage keyword expansion - for instance as discussed in this thread: http://kerneltrap.org/mailarchive/git/2007/10/11/335112 Cheers. -- Jing Xue ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.