From: Lars Schneider <larsxschneider@gmail.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: How to debug a "git merge"?
Date: Wed, 14 Mar 2018 21:53:31 +0100 [thread overview]
Message-ID: <77D50EDA-6262-4288-B6E7-87BE63EFB54F@gmail.com> (raw)
In-Reply-To: <ddde09e9-0524-23f8-3585-ac00c2ec7f45@gmail.com>
> On 14 Mar 2018, at 18:02, Derrick Stolee <stolee@gmail.com> wrote:
>
> On 3/14/2018 12:56 PM, Lars Schneider wrote:
>> Hi,
>>
>> I am investigating a Git merge (a86dd40fe) in which an older version of
>> a file won over the newer version. I try to understand why this is the
>> case. I can reproduce the merge with the following commands:
>> $ git checkout -b test a02fa3303
>> $ GIT_MERGE_VERBOSITY=5 git merge --verbose c1b82995c
>>
>> The merge actually generates a merge conflict but not for my
>> problematic file. The common ancestor of the two parents (merge base)
>> is b91161554.
>>
>> The merge graph is not pretty (the committers don't have a clean
>> branching scheme) but I cannot spot a problem between the merge commit
>> and the common ancestor:
>> $ git log --graph --oneline a86dd40fe
>
> Have you tried `git log --graph --oneline --simplify-merges -- path` to see what changes and merges involved the file? I find that view to be very helpful (while the default history simplification can hide things). In particular, if there was a change that was reverted in one side and not another, we could find out.
Thanks for this tip! Unfortunately, this only confirms my current view:
### First parent
$ git log --graph --oneline --simplify-merges a02fa3303 -- path/to/problem
* 4e47a10c7 <-- old version
* 01f01f61c
### Second parent
$ git log --graph --oneline --simplify-merges c1b82995c -- path/to/problem
* 590e52ed1 <-- new version
* 8e598828d
* ad4e9034b
* 4e47a10c7
* 01f01f61c
### Merge
$ git log --graph --oneline --simplify-merges a86dd40fe -- path/to/problem
* a86dd40fe <-- old version ?!?! That's the problem!
|\
| * 590e52ed1 <-- new version
| * 8e598828d
| * ad4e9034b
|/
* 4e47a10c7 <-- old version
* 01f01f61c
> You could also use the "A...B" to check your two commits for merging, and maybe add "--boundary".
$ git diff --boundary a02fa3303...c1b82995c -- path/to/problem
This looks like the correct diff. The "new version" is mark as +/add/green in the diff.
Does this make any sense to you?
Thank you,
Lars
next prev parent reply other threads:[~2018-03-14 20:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-14 16:56 How to debug a "git merge"? Lars Schneider
2018-03-14 17:02 ` Derrick Stolee
2018-03-14 20:53 ` Lars Schneider [this message]
2018-03-20 1:32 ` Derrick Stolee
2018-03-14 22:20 ` Jeff King
2018-03-15 9:51 ` Lars Schneider
2018-03-15 14:09 ` Jeff King
2018-03-15 15:51 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=77D50EDA-6262-4288-B6E7-87BE63EFB54F@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).