From: Junio C Hamano <gitster@pobox.com>
To: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [RFC] introducing git replay
Date: Fri, 15 Apr 2022 13:33:19 -0700 [thread overview]
Message-ID: <xmqqbkx2ccj4.fsf@gitster.g> (raw)
In-Reply-To: <CAOc6etYvOhqQn3icWj3Ny1m+J_60h7aiqW-gvm=dQyDLgG=6NA@mail.gmail.com> (Edmundo Carmona Antoranz's message of "Fri, 15 Apr 2022 20:46:12 +0200")
Edmundo Carmona Antoranz <eantoranz@gmail.com> writes:
> But I am probably wrong in terms of what I understand that you meant.
> Can you expand a little bit, if you don't mind?
What I had in mind is what I have to do every day multiple times.
'master'..'seen' is a series of merges of tips of different topic
branches.
---T topic
\
\ \ \ \
--M---o----o----o----S seen
^
master
Some of the topic branches may get updated and 'master' may gain
more commits by merging some topics. Now it is time to update the
'master'..'seen' chain.
---T---P topic (updated)
\
\ \ \ \
--M---o----o----o----S seen
\
o
\
N
master
It would be wonderful if a single command like replay can be used to
say "In the old history master..seen I have bunch of merges. master
used to be M but now it is at N. Rebuild M..S on top of N _but_
with a bit of twist. Some of the topics in M...S may have been
merged to 'master' between M..N and the replayed history on top of N
does not want to have a merge from such 'already graduated' topics.
Many topics are updated, either by adding a new commit on top or
completely rewritten, and we want an updated tip of these topic
branches, not the old tip that I merged when I created M..S chain,
when replaying the history on top of N."
That kind of operation is quite different from what "rebase" does,
and deserves to be under a different name.
Compared to that, "replay exactly the same set of commits in the
same shape on top of a different commit whose tree happens to be the
same as the original", is a mere special case of "rebase" that is
not all that interesting. It may be a worthwhile thing to do to
teach "rebase" capable of doing so reliably and more efficiently,
but that still falls into "improving rebase" category, not meriting
a separate command.
next prev parent reply other threads:[~2022-04-15 20:33 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 16:43 [RFC] introducing git replay Edmundo Carmona Antoranz
2022-04-13 17:05 ` Junio C Hamano
2022-04-15 18:46 ` Edmundo Carmona Antoranz
2022-04-15 20:33 ` Junio C Hamano [this message]
2022-04-16 5:35 ` Edmundo Carmona Antoranz
2022-04-16 6:39 ` Junio C Hamano
2022-04-16 7:02 ` Edmundo Carmona Antoranz
2022-04-17 5:05 ` Elijah Newren
2022-04-17 5:37 ` Edmundo Carmona Antoranz
2022-04-17 17:22 ` Martin von Zweigbergk
2022-04-18 7:04 ` Edmundo Carmona Antoranz
2022-04-18 7:29 ` Sergey Organov
2022-04-18 16:27 ` Elijah Newren
2022-04-18 17:33 ` Sergey Organov
2022-04-20 11:27 ` Tao Klerks
2022-04-21 2:33 ` Elijah Newren
2022-04-13 17:26 ` rsbecker
2022-04-13 17:30 ` Edmundo Carmona Antoranz
2022-04-13 17:44 ` Edmundo Carmona Antoranz
2022-04-13 17:44 ` Phillip Susi
2022-04-13 17:49 ` Edmundo Carmona Antoranz
2022-04-13 19:07 ` Ævar Arnfjörð Bjarmason
2022-04-13 17:48 ` Junio C Hamano
2022-04-13 17:56 ` Edmundo Carmona Antoranz
2022-04-13 20:06 ` Eric Sunshine
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=xmqqbkx2ccj4.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
/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).