git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Luke Diamand <luke@diamand.org>
Cc: "Holloway\, Blair" <Blair_Holloway@playstation.sony.com>,
	"git\@vger.kernel.org" <git@vger.kernel.org>,
	Pete Wyckoff <pw@padd.com>
Subject: Re: [PATCH] git-p4: fix filetype detection on files opened exclusively
Date: Thu, 02 Apr 2015 14:17:07 -0700	[thread overview]
Message-ID: <xmqqiodei624.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAE5ih7_QpkX-U+XJ8gKSKKt1+Vu+FM4XBADTkys-4MDa129jyw@mail.gmail.com> (Luke Diamand's message of "Thu, 2 Apr 2015 20:54:32 +0100")

Luke Diamand <luke@diamand.org> writes:

> (+Pete for interest).
>
> On 31 March 2015 at 22:54, Holloway, Blair
> <Blair_Holloway@playstation.sony.com> wrote:
>> If a Perforce server is configured to automatically set +l (exclusive lock) on
>> add of certain file types, git p4 submit will fail during getP4OpenedType, as
>> the regex doesn't expect the trailing '*exclusive*' from p4 opened:
>
> Thanks - that actually fixes a part of the long-standing problem of
> handling locked files which Pete identified about a year ago.
>
> There's a test case for handling of locked files,
> t9816-git-p4-locked.sh, which needs updating now as a bit more of it
> passes. Junio, I'll submit a followup patch to update those tests once
> I get back from vacation.

Thanks.  Lest I forget, I'd prefer this patch resent from you in a
two (or more) patch series, with this one marked as 1/N with your
"Acked-by:", and your follow-up patches 2/N...N/N.  If it is not a
too much work for you, that is.

Thanks.

      reply	other threads:[~2015-04-02 21:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-31 21:54 [PATCH] git-p4: fix filetype detection on files opened exclusively Holloway, Blair
2015-04-02 19:54 ` Luke Diamand
2015-04-02 21:17   ` Junio C Hamano [this message]

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=xmqqiodei624.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=Blair_Holloway@playstation.sony.com \
    --cc=git@vger.kernel.org \
    --cc=luke@diamand.org \
    --cc=pw@padd.com \
    /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).