Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths

From: Luke Diamand <luke@diamand.org>
Date: Dec 14, 2015, 23:09 UTC
Message-ID: <CAE5ih7_qY5oF+UWs4gE2eHUu17pBg6TVGTUyRRRcBe12ybkw+Q@mail.gmail.com>
In-Reply-To: <xmqqtwnkhegw.fsf@gitster.mtv.corp.google.com>

Sorry - I've just run the tests, and this change causes one of the test cases in t9800-git-p4-basic.sh to fail.

It looks like the test case makes an assumption about who wins if two P4 depots have changes to files that end up in the same place, and this change reverses the order. It may actually be fine, but it needs to be thought about a bit.

Sam - do you have any thoughts on this?

Thanks Luke

On 14 December 2015 at 22:06, Junio C Hamano <gitster@pobox.com> wrote:

Show 20 quoted lines

> Luke Diamand <luke@diamand.org> writes:
>
>> On 14 December 2015 at 19:16, Junio C Hamano <gitster@pobox.com> wrote:
>>> Luke Diamand <luke@diamand.org> writes:
>>>
>>>> Having just fixed this, I've now just spotted that Sam Hocevar's fix
>>>> to reduce the number of P4 transactions also fixes it:
>>>>
>>>> https://www.mail-archive.com/git%40vger.kernel.org/msg81880.html
>>>>
>>>> That seems like a cleaner fix.
>>>
>>> Hmm, do you mean I should ignore this series and take the other one,
>>> take only 1/2 from this for tests and then both patches in the other
>>> one, or something else?
>>
>> The second of those (take only 1/2 from this for tests, and then both
>> from the other) seems like the way to go.
>
> OK.  Should I consider the two patches from Sam "Reviewed-by" you?