git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Tor Arvid Lund" <torarvid@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "David Brown" <git@davidb.org>, dhruva <dhruva@ymail.com>,
	"GIT SCM" <git@vger.kernel.org>, "Simon Hausmann" <simon@lst.de>
Subject: Re: [PATCH] Optional shrinking of RCS keywords in git-p4
Date: Mon, 15 Sep 2008 13:02:32 +0200	[thread overview]
Message-ID: <1a6be5fa0809150402m6020698ci9204109a0b615c1c@mail.gmail.com> (raw)
In-Reply-To: <7vy71tetvt.fsf@gitster.siamese.dyndns.org>

On Mon, Sep 15, 2008 at 9:43 AM, Junio C Hamano <gitster@pobox.com> wrote:
> David Brown <git@davidb.org> 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-

  reply	other threads:[~2008-09-15 11:04 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-15  6:26 [PATCH] Optional shrinking of RCS keywords in git-p4 dhruva
2008-09-15  6:35 ` David Brown
2008-09-15  7:43   ` Junio C Hamano
2008-09-15 11:02     ` Tor Arvid Lund [this message]
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
  -- strict thread matches above, loose matches on Subject: below --
2008-09-19  2:56 dhruva
2008-09-16 13:33 dhruva
2008-09-16  4:53 dhruva
2008-09-16 17:26 ` Daniel Barkalow
2008-09-16  2:51 dhruva
2008-09-15 11:46 dhruva
2008-09-15 15:27 ` Tor Arvid Lund
2008-09-15  7:21 dhruva
2008-09-15  6:31 dhruva
2008-09-15  5:58 Dhruva Krishnamurthy
2008-09-15  6:09 ` David Brown
2008-09-15  6:17 ` Junio C Hamano

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=1a6be5fa0809150402m6020698ci9204109a0b615c1c@mail.gmail.com \
    --to=torarvid@gmail.com \
    --cc=dhruva@ymail.com \
    --cc=git@davidb.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=simon@lst.de \
    /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).