From: Luke Diamand <luke@diamand.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Users <git@vger.kernel.org>,
James Farwell <jfarwell@vmware.com>,
Lars Schneider <larsxschneider@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Sam Hocevar <sam@hocevar.net>
Subject: Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths
Date: Mon, 14 Dec 2015 23:09:21 +0000 [thread overview]
Message-ID: <CAE5ih7_qY5oF+UWs4gE2eHUu17pBg6TVGTUyRRRcBe12ybkw+Q@mail.gmail.com> (raw)
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:
> 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?
next prev parent reply other threads:[~2015-12-14 23:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-13 20:07 [PATCH 0/2] git-p4: fix for handling of multiple depot paths Luke Diamand
2015-12-13 20:07 ` [PATCH 1/2] git-p4: failing test case for skipping changes with multiple depots Luke Diamand
2015-12-13 20:07 ` [PATCH 2/2] git-p4: fix handling of multiple depot paths Luke Diamand
2015-12-13 20:19 ` [PATCH 0/2] git-p4: fix for " Luke Diamand
2015-12-14 19:16 ` Junio C Hamano
2015-12-14 20:58 ` Luke Diamand
2015-12-14 22:06 ` Junio C Hamano
2015-12-14 23:09 ` Luke Diamand [this message]
2015-12-15 22:56 ` James Farwell
2015-12-16 0:38 ` Sam Hocevar
2015-12-16 7:51 ` Luke Diamand
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAE5ih7_qY5oF+UWs4gE2eHUu17pBg6TVGTUyRRRcBe12ybkw+Q@mail.gmail.com \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jfarwell@vmware.com \
--cc=larsxschneider@gmail.com \
--cc=sam@hocevar.net \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).