Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

2018-07-11 Thread Junio C Hamano
Elijah Newren writes: > On Mon, Jul 9, 2018 at 1:22 PM, Elijah Newren wrote: >> On Mon, Jul 9, 2018 at 10:53 AM, Junio C Hamano wrote: >>> Elijah Newren writes: >>> When a merge succeeds, we expect the resulting contents to depend only upon the trees and blobs of the branches involve

Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

2018-07-10 Thread Elijah Newren
On Mon, Jul 9, 2018 at 1:22 PM, Elijah Newren wrote: > On Mon, Jul 9, 2018 at 10:53 AM, Junio C Hamano wrote: >> Elijah Newren writes: >> >>> When a merge succeeds, we expect the resulting contents to depend only >>> upon the trees and blobs of the branches involved and of their merge >>> base(s

Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

2018-07-10 Thread Jeff King
On Tue, Jul 10, 2018 at 08:42:04AM -0700, Elijah Newren wrote: > > test-lint is supposed to be run automatically as part of "make test" (or > > "make prove"), unless you've specifically disabled it by setting > > TEST_LINT. And it does complain for me with your patches. If it doesn't > > for you,

Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

2018-07-10 Thread Elijah Newren
On Mon, Jul 9, 2018 at 9:44 PM, Jeff King wrote: > On Mon, Jul 09, 2018 at 01:22:29PM -0700, Elijah Newren wrote: > >> Oh, I didn't know about test-lint. Is there a place that documents >> the various checks you run, so I can avoid slowing you down? Ones I >> know about: >> >> Already documented

Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

2018-07-09 Thread Jeff King
On Mon, Jul 09, 2018 at 01:22:29PM -0700, Elijah Newren wrote: > Oh, I didn't know about test-lint. Is there a place that documents > the various checks you run, so I can avoid slowing you down? Ones I > know about: > > Already documented: > * `make DEVELOPER=1` (from CodingGuidelines) > *

Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

2018-07-09 Thread Elijah Newren
On Mon, Jul 9, 2018 at 10:53 AM, Junio C Hamano wrote: > Elijah Newren writes: > >> When a merge succeeds, we expect the resulting contents to depend only >> upon the trees and blobs of the branches involved and of their merge >> base(s). Unfortunately, there are currently about half a dozen cas

Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

2018-07-09 Thread Junio C Hamano
Elijah Newren writes: > SPOILER ALERT: This series contains answers to the "fun puzzle" at > > https://public-inbox.org/git/CABPp-BFc1OLYKzS5rauOehvEugPc0oGMJp-NMEAmVMW7QR=4...@mail.gmail.com/ > > When a merge succeeds, we expect the resulting contents to depend only > upon the trees and blobs

[PATCH 0/6] Add merge recursive testcases with undetected conflicts

2018-06-30 Thread Elijah Newren
SPOILER ALERT: This series contains answers to the "fun puzzle" at https://public-inbox.org/git/CABPp-BFc1OLYKzS5rauOehvEugPc0oGMJp-NMEAmVMW7QR=4...@mail.gmail.com/ When a merge succeeds, we expect the resulting contents to depend only upon the trees and blobs of the branches involved and of th