From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts
Date: Wed, 11 Jul 2018 08:40:12 -0700 [thread overview]
Message-ID: <xmqqmuux4w83.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BGH+6XkJwqhUOydT0CQBRTr=Hf79SU5PGZ2NrvV5uNjCw@mail.gmail.com> (Elijah Newren's message of "Tue, 10 Jul 2018 21:02:32 -0700")
Elijah Newren <newren@gmail.com> writes:
> On Mon, Jul 9, 2018 at 1:22 PM, Elijah Newren <newren@gmail.com> wrote:
>> On Mon, Jul 9, 2018 at 10:53 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>> Elijah Newren <newren@gmail.com> 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 cases
>>>> where the contents of a "successful" merge depend on the relative
>>>> commit timestamps of the merge bases. Document these with testcases.
>>>>
>>>> (This series came out of looking at modifying how file collision
>>>> conflict types are handled, as discussed at [1]. I discovered these
>>>> issues while working on that topic.)
>>>
>>> I have a topic branch for this series but not merged to 'pu' as
>>> test-lint gives these:
>>>
> ...
>>
>> ... here's a fixup to the topic; as you pointed out, the exact contents
>> of the script being written were actually irrelevant; it was just an
>> input to a merge.
>>
>> -- 8< --
>> Subject: [PATCH] fixup! t6036: add a failed conflict detection case: regular
>> files, different modes
>>
>
> Does a 'fixup!' commit require a Signed-off-by? Just realized that
> this one didn't have it, though I don't know if it's necessary. If it
> is:
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
Thanks. I queued it separately before running out of time Monday,
but will actually squash it in to the main patch.
prev parent reply other threads:[~2018-07-11 15:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-01 4:11 [PATCH 0/6] Add merge recursive testcases with undetected conflicts Elijah Newren
2018-07-01 4:11 ` [PATCH 1/6] t6036: add a failed conflict detection case with symlink modify/modify Elijah Newren
2018-07-01 4:11 ` [PATCH 2/6] t6036: add a failed conflict detection case with symlink add/add Elijah Newren
2018-07-01 4:11 ` [PATCH 3/6] t6036: add a failed conflict detection case with submodule modify/modify Elijah Newren
2018-07-01 4:11 ` [PATCH 4/6] t6036: add a failed conflict detection case with submodule add/add Elijah Newren
2018-07-01 4:11 ` [PATCH 5/6] t6036: add a failed conflict detection case with conflicting types Elijah Newren
2018-07-01 4:11 ` [PATCH 6/6] t6036: add a failed conflict detection case: regular files, different modes Elijah Newren
2018-07-09 17:53 ` [PATCH 0/6] Add merge recursive testcases with undetected conflicts Junio C Hamano
2018-07-09 20:22 ` Elijah Newren
2018-07-10 4:44 ` Jeff King
2018-07-10 15:42 ` Elijah Newren
2018-07-10 17:19 ` Jeff King
2018-07-11 4:02 ` Elijah Newren
2018-07-11 15:40 ` Junio C Hamano [this message]
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=xmqqmuux4w83.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@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).