From: Junio C Hamano Date: Mon, 14 Dec 2015 19:16:38 GMT Subject: Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths Message-ID: In-Reply-To: Luke Diamand 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 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 >>