From: Junio C Hamano Date: Mon, 15 Sep 2008 06:17:19 GMT Subject: Re: [PATCH] Optional shrinking of RCS keywords in git-p4 Message-ID: <7v4p4iexw0.fsf@gitster.siamese.dyndns.org> In-Reply-To: <1221458331-8804-1-git-send-email-dhruva@ymail.com> Dhruva Krishnamurthy writes: > Modifying RCS keywords prevents submitting to p4 from git due to missing hunks. Hmm. How are "missing hunks" caused? Do you mean: - the substituted values from the expanded keywords are stripped out by default (with kwstrip=True) when you check out from p4; - when you submit your changes back, p4 side expects you to send the file with keywords just as it originally expanded; and this causes the contents mismatch, leading p4 to reject your change? The patch itself looks fine; I just wanted to make sure commit log explains what was fixed.