From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: Toon Claes <toon@iotcl.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v2] replay: support replaying down from root commit
Date: Tue, 31 Mar 2026 09:20:51 -0700 [thread overview]
Message-ID: <xmqq4ilw2cnw.fsf@gitster.g> (raw)
In-Reply-To: <CAP8UFD3P2Gs0J1FNyKW2URwSEW4ZaTrVO7cM1V8sG+zzXctbhg@mail.gmail.com> (Christian Couder's message of "Tue, 31 Mar 2026 12:34:19 +0200")
Christian Couder <christian.couder@gmail.com> writes:
> So if we are about to fix that main issue in a separate patch or
> series, and if we plan to emit something like the following in the
> regular case:
>
> "fatal: replaying failed due to conflict"
>
> and something like the following when replaying from a root commit:
>
> "fatal: replaying from root commit XXX failed due to conflict"
>
> then I think it would alleviate the need for a doc update.
Hmph, what would you do to the other side (i.e., replay from some
specified boundary) of the message? When the version of "git
replay" command a user who sees for the first time comes with the
ability to replay from a root on day one, "from root commit" is not
so special from "from these boundary commits", so I am not sure if
it makes sense to have such a message that treats the down-to-root
case any specially.
next prev parent reply other threads:[~2026-03-31 16:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-17 18:56 [PATCH] replay: support replaying down from root commit Toon Claes
2026-03-17 19:59 ` Junio C Hamano
2026-03-24 17:25 ` Toon Claes
2026-03-24 19:35 ` [PATCH v2] " Toon Claes
2026-03-24 19:53 ` Junio C Hamano
2026-03-25 10:00 ` Christian Couder
2026-03-25 12:19 ` Ben Knoble
2026-03-25 15:35 ` Make git-replay(1) warn if revision-range isn't a range (was: Re: [PATCH v2] replay: support replaying down from root commit) Toon Claes
2026-03-25 15:32 ` [PATCH v2] replay: support replaying down from root commit Toon Claes
2026-03-25 15:37 ` Toon Claes
2026-03-27 16:45 ` Junio C Hamano
2026-03-31 10:34 ` Christian Couder
2026-03-31 16:20 ` Junio C Hamano [this message]
2026-04-02 9:08 ` Toon Claes
2026-04-02 17:02 ` Junio C Hamano
2026-04-03 6:49 ` Christian Couder
2026-03-25 16:49 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4ilw2cnw.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=toon@iotcl.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox