Re: [PATCH] git-p4: fix filetype detection on files opened exclusively

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 2, 2015, 21:17 UTC
Message-ID: <xmqqiodei624.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAE5ih7_QpkX-U+XJ8gKSKKt1+Vu+FM4XBADTkys-4MDa129jyw@mail.gmail.com>

Luke Diamand <luke@diamand.org> writes:

Show 15 quoted lines

> (+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.