From: Elijah Newren <newren@gmail.com>
To: Tao Klerks <tao@klerks.biz>
Cc: Sergey Organov <sorganov@gmail.com>,
Edmundo Carmona Antoranz <eantoranz@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Git List <git@vger.kernel.org>
Subject: Re: [RFC] introducing git replay
Date: Wed, 20 Apr 2022 19:33:44 -0700 [thread overview]
Message-ID: <CABPp-BFh-=3E-yMDaU1TgigwriFDbd-CwXe0PJKkc422LCSP6Q@mail.gmail.com> (raw)
In-Reply-To: <CAPMMpoh9-sm57D_OSVpo4A3KdJypNZbZ2KTWURvcOW0690eviA@mail.gmail.com>
On Wed, Apr 20, 2022 at 4:27 AM Tao Klerks <tao@klerks.biz> wrote:
>
> On Mon, Apr 18, 2022 at 6:28 PM Elijah Newren <newren@gmail.com> wrote:
> >
> > If you read the suggestion I made (which I'll reinclude here at [1]),
> > you'll note that I read the old thread you link to with both your and
> > Phillips' suggestions. I dug into them with some examples, and came
> > to the conclusion that we needed something better, as I briefly
> > commented when proposing my suggested alternative (at [1]). I
> > appreciate your suggestion and the time you put into it, but based on
> > my earlier investigation, I believe my suggestion would be a better
> > way of preserving user changes in merges and I'll be implementing it.
> > The fact that Martin (in this thread) independently came up with the
> > same basic idea and implemented it in jj (though he apparently has
> > some further tweaks around the object model) and it works well
> > suggests to me that the idea has some real world testing too that
> > gives me further confidence in the idea.
> >
> > [1] https://lore.kernel.org/git/CABPp-BGW39_5r8Lbt3ymR+F_=hWJcf=2e7O75vFNJ=3CEL5s=g@mail.gmail.com/
>
> Thank you for the clarification, and sorry I'm clearly missing
> something here - the link you provided is to a deeply threaded
> conversation about "[PATCH 08/12] merge-ort: provide a
> merge_get_conflicted_files() helper function", in the context of a
> server-side merge support patchset... I can't figure out how to relate
> that conversation to the "how can safely reusing previous merge
> outcomes when rebasing a merge work well?" topic I thought you had
> introduced here :(
Sorry, I entered the wrong link, and assumed it was right when I
copied it into the response email. Whoops. The link for [1] was
supposed to be https://lore.kernel.org/git/CABPp-BHp+d62dCyAaJfh1cZ8xVpGyb97mZryd02aCOX=Qn=Ltw@mail.gmail.com/
But as has been said elsewhere, what you're asking for doesn't exist
yet. That other email was where I outlined a bunch of details about
what someone could do to implement it, and where I pointed out that I
planned to eventually implement it if Dscho didn't beat me to it.
I've since started on it.
I also linked to my tree a few times where anyone can look at what I
have done so far (which isn't useful to users yet). If you want to
take what I've implemented and implement the rest before I can, go
ahead. If you want to take the steps I outlined on how to do it in
the email link I provided above, and implement it from scratch then go
ahead. But otherwise, as Junio already pointed out in this thread, it
just doesn't exist today.
next prev parent reply other threads:[~2022-04-21 2:34 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
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 [this message]
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='CABPp-BFh-=3E-yMDaU1TgigwriFDbd-CwXe0PJKkc422LCSP6Q@mail.gmail.com' \
--to=newren@gmail.com \
--cc=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sorganov@gmail.com \
--cc=tao@klerks.biz \
/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).