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

t;l...@diamand.org> Sent: Monday, December 14, 2015 3:09 PM To: Junio C Hamano Cc: Git Users; James Farwell; Lars Schneider; Eric Sunshine; Sam Hocevar Subject: Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths Sorry - I've just run the tests, and this change causes one of the test

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

in order by the perforce change number. :) > > - James > > > From: Luke Diamand <l...@diamand.org> > Sent: Monday, December 14, 2015 3:09 PM > To: Junio C Hamano > Cc: Git Users; James Farwell; Lars Schneider; Eric Sunshine; Sam Hocevar

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

On 16/12/15 00:38, Sam Hocevar wrote: I'm actually surprised that the patch changes the order at all, since all it does is affect the decision (on a yes/no basis) to include a given file into a changelist. I'm going to have a look at that specific unit test, but of course as a user I'd prefer if

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

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

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

Luke Diamand writes: > On 14 December 2015 at 19:16, Junio C Hamano wrote: >> 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: >>>

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

On 14 December 2015 at 19:16, Junio C Hamano wrote: > 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: >> >>

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

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

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

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

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

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. Luke On 13 December 2015 at 20:07, Luke Diamand wrote: