Re: [PATCH v4 0/6] Support triangular workflows
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 1, 2013, 05:35 UTC
- Message-ID
- <7vhajqlsom.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <7vppyeltz7.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 18 quoted lines
> Junio C Hamano <gitster@pobox.com> writes: > >> Ramkumar Ramachandra <artagnon@gmail.com> writes: >> >>> Junio C Hamano wrote: >>>> Jeff King <peff@peff.net> writes: >>>>> [...] >>>> Thanks. That is one of the reasons why we do not want to see too >>>> many custom test helper functions. >>> >>> I noticed that you queued my original series without modification in >>> rr/triangle. Should I submit a re-roll with Peff's suggestion >>> incorporated? >> >> If you want the topic to make progress, yes. > > By the way, this series seems to break a few tests in the test > suite,...
I suspect this could be interaction with push-default change near the tip of 'pu'. Setting push.default explicitly to matching in the test may be necessary.
Also the t5516 is involved in in-flight churns, so there could be some merge mixups.