From: Junio C Hamano <gitster@pobox.com>
To: Luke Diamand <luke@diamand.org>
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 11:16:38 -0800 [thread overview]
Message-ID: <xmqqio40kfhl.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAE5ih7_T1xC9AyO41T4ktJmj6tENaEGbAG556WLyfsYz-jawsw@mail.gmail.com> (Luke Diamand's message of "Sun, 13 Dec 2015 20:19:42 +0000")
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?
Thanks.
>
> Luke
>
>
> On 13 December 2015 at 20:07, Luke Diamand <luke@diamand.org> wrote:
>> James Farwell reported a bug I introduced into git-p4 with
>> handling of multiple depot paths:
>>
>> http://article.gmane.org/gmane.comp.version-control.git/282297
>>
>> This patch series adds a failing test case, and a fix for this
>> problem.
>>
>> Luke
>>
>> Luke Diamand (2):
>> git-p4: failing test case for skipping changes with multiple depots
>> git-p4: fix handling of multiple depot paths
>>
>> git-p4.py | 8 +++++---
>> t/t9818-git-p4-block.sh | 28 +++++++++++++++++++++++++++-
>> 2 files changed, 32 insertions(+), 4 deletions(-)
>>
>> --
>> 2.6.2.474.g3eb3291
>>
next prev parent reply other threads:[~2015-12-14 19:16 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 [this message]
2015-12-14 20:58 ` Luke Diamand
2015-12-14 22:06 ` Junio C Hamano
2015-12-14 23:09 ` Luke Diamand
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqio40kfhl.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jfarwell@vmware.com \
--cc=larsxschneider@gmail.com \
--cc=luke@diamand.org \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.