From: Junio C Hamano <gitster@pobox.com>
To: Dhruva Krishnamurthy <dhruva@ymail.com>
Cc: GIT SCM <git@vger.kernel.org>
Subject: Re: [PATCH] Optional shrinking of RCS keywords in git-p4
Date: Sun, 14 Sep 2008 23:17:19 -0700 [thread overview]
Message-ID: <7v4p4iexw0.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1221458331-8804-1-git-send-email-dhruva@ymail.com> (Dhruva Krishnamurthy's message of "Mon, 15 Sep 2008 11:28:51 +0530")
Dhruva Krishnamurthy <dhruva@ymail.com> 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.
next prev parent reply other threads:[~2008-09-15 6:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-15 5:58 [PATCH] Optional shrinking of RCS keywords in git-p4 Dhruva Krishnamurthy
2008-09-15 6:09 ` David Brown
2008-09-15 6:17 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-15 6:26 dhruva
2008-09-15 6:35 ` David Brown
2008-09-15 7:43 ` Junio C Hamano
2008-09-15 11:02 ` Tor Arvid Lund
2008-09-15 19:22 ` Daniel Barkalow
2008-09-16 4:12 ` David Brown
2008-09-16 12:58 ` Jing Xue
2008-09-16 17:12 ` Daniel Barkalow
2008-09-16 17:32 ` Daniel Barkalow
2008-09-15 6:31 dhruva
2008-09-15 7:21 dhruva
2008-09-15 11:46 dhruva
2008-09-15 15:27 ` Tor Arvid Lund
2008-09-16 2:51 dhruva
2008-09-16 4:53 dhruva
2008-09-16 17:26 ` Daniel Barkalow
2008-09-16 13:33 dhruva
2008-09-19 2:56 dhruva
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=7v4p4iexw0.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.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).