Re: [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-14 Thread Johannes Schindelin
Hi James, On Mon, 14 Oct 2019, James Coglan wrote: > [...] How should I go about sharing the current state of my patch > series after I've incorporated all the changes suggested here? Should > I post them as replies on this thread, or start a new pull request via > GitGitGadget? Just force-push

Re: [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-14 Thread Derrick Stolee
On 10/14/2019 11:38 AM, James Coglan wrote: > On 13/10/2019 07:56, Jeff King wrote: >> On Fri, Oct 11, 2019 at 06:04:21PM +0100, James Coglan wrote: >> I should have noticed in your earlier commits, but why don't you keep the output inside the test suite? You can start with "cat >expect <

Re: [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-14 Thread James Coglan
On 13/10/2019 07:56, Jeff King wrote: > On Fri, Oct 11, 2019 at 06:04:21PM +0100, James Coglan wrote: > >>> I should have noticed in your earlier commits, but why don't you keep >>> the output inside the test suite? You can start with "cat >expect <<-EOF" >>> to have it ignore leading whitespace.

Re: [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-12 Thread Jeff King
On Fri, Oct 11, 2019 at 06:04:21PM +0100, James Coglan wrote: > > I should have noticed in your earlier commits, but why don't you keep > > the output inside the test suite? You can start with "cat >expect <<-EOF" > > to have it ignore leading whitespace. Sorry if there's something else about > >

Re: [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-11 Thread James Coglan
On 10/10/2019 18:49, Derrick Stolee wrote: > On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: >> From: James Coglan >> >> Following the introduction of "left-skewed" merges, which are merges >> whose first parent fuses with another edge to its left, we have some >> more edge cases to d

Re: [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-10 Thread Derrick Stolee
On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: > From: James Coglan > > Following the introduction of "left-skewed" merges, which are merges > whose first parent fuses with another edge to its left, we have some > more edge cases to deal with in the display of commit and post-merge

[PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-10 Thread James Coglan via GitGitGadget
From: James Coglan Following the introduction of "left-skewed" merges, which are merges whose first parent fuses with another edge to its left, we have some more edge cases to deal with in the display of commit and post-merge lines. The current graph code handles the following cases for edges ap