threads / discuss / 51910

git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

Subject: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

## tl;dr

5 messages between Sep 24, 2019 and Sep 25, 2019.

replies: 4people: 3as markdown or json

Philip Oakley· Sep 24, 2019, 20:49 UTC · lore

Hi list, cc Pratyush,

While rebasing an old series, I had a 3-way merge fall back that didn't show the `||||||| merged common ancestors` very well in git-gui.

That is, the conflict markers, and common ancestor lines, are treated as being part of the current HEAD hunk, rather than being separated.

I opened a Git for Windows issue https://github.com/git-for-windows/git/issues/2340 and attach the screenshot of the git-gui markers.

I've not had any chance to look at the underlying code, but thought it worth reporting. I guess the issue has been there a while.

Philip

Philip Oakley· Sep 24, 2019, 22:05 UTC · re: Philip Oakley · lore

Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

Hi list, cc Pratyush,

[resend without attached png file]

While rebasing an old series, I had a 3-way merge fall back that didn't show the `||||||| merged common ancestors` very well in git-gui.

That is, the conflict markers, and common ancestor lines, are treated as being part of the current HEAD hunk, rather than being separated.

I opened a Git for Windows issue https://github.com/git-for-windows/git/issues/2340 which has the screenshot of the git-gui markers.

I've not had any chance to look at the underlying code, but thought it worth reporting. I guess the issue has been there a while.

Philip

Bert Wesarg· Sep 25, 2019, 06:33 UTC · re: Philip Oakley · lore

Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

Pratyush,

once again, I had done this years ago. I may post an updated patch in the evening:

https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b

Bert

On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley <philipoakley@iee.email> wrote:

Show 23 quoted lines

>
> Hi list,
> cc Pratyush,
>
> [resend without attached png file]
>
> While rebasing an old series, I had a 3-way merge fall back that didn't
> show the `||||||| merged common ancestors` very well in git-gui.
>
> That is, the conflict markers, and common ancestor lines, are treated as
> being part of the current HEAD hunk, rather than being separated.
>
> I opened a Git for Windows issue
> https://github.com/git-for-windows/git/issues/2340 which has the
> screenshot of the git-gui markers.
>
> I've not had any chance to look at the underlying code, but thought it
> worth reporting. I guess the issue has been there a while.
>
> Philip
>
>
>

Philip Oakley· Sep 25, 2019, 10:09 UTC · re: Bert Wesarg · lore

Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

On 25/09/2019 07:33, Bert Wesarg wrote:

Show 8 quoted lines

> Pratyush,
>
> once again, I had done this years ago. I may post an updated patch in
> the evening:
>
> https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b
>
> Bert

Thanks, I'll see if I can look at it (I'd also need to re-prepare my rerere cache [how to do /that/ ?] and the rebase)

Show 24 quoted lines

>
> On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley <philipoakley@iee.email> wrote:
>> Hi list,
>> cc Pratyush,
>>
>> [resend without attached png file]
>>
>> While rebasing an old series, I had a 3-way merge fall back that didn't
>> show the `||||||| merged common ancestors` very well in git-gui.
>>
>> That is, the conflict markers, and common ancestor lines, are treated as
>> being part of the current HEAD hunk, rather than being separated.
>>
>> I opened a Git for Windows issue
>> https://github.com/git-for-windows/git/issues/2340 which has the
>> screenshot of the git-gui markers.
>>
>> I've not had any chance to look at the underlying code, but thought it
>> worth reporting. I guess the issue has been there a while.
>>
>> Philip
>>
>>
>>

Pratyush Yadav· Sep 25, 2019, 13:34 UTC · re: Bert Wesarg · lore

Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

On 25/09/19 08:33AM, Bert Wesarg wrote:

Show 6 quoted lines

> Pratyush,
> 
> once again, I had done this years ago. I may post an updated patch in
> the evening:
> 
> https://github.com/bertwesarg/git-gui/commit/90ee4a8c260132a6b730040095929fd267cedd7b

Nice! I was about to dive into this bug, but it is great that you have 
already fixed it. Send it on the list when you get the time and we can 
discuss it here :)

Show 19 quoted lines

> On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley <philipoakley@iee.email> wrote:
> >
> > Hi list,
> > cc Pratyush,
> >
> > [resend without attached png file]
> >
> > While rebasing an old series, I had a 3-way merge fall back that didn't
> > show the `||||||| merged common ancestors` very well in git-gui.
> >
> > That is, the conflict markers, and common ancestor lines, are treated as
> > being part of the current HEAD hunk, rather than being separated.
> >
> > I opened a Git for Windows issue
> > https://github.com/git-for-windows/git/issues/2340 which has the
> > screenshot of the git-gui markers.
> >
> > I've not had any chance to look at the underlying code, but thought it
> > worth reporting. I guess the issue has been there a while.

-- 
Regards,
Pratyush Yadav