Re: [RFC] introducing git replay

From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date: Apr 13, 2022, 17:44 UTC
Message-ID: <CAOc6eta7-ZieTnTjmCicXoqf-j=d1SmfRT=PS+cAZUxKw+ti=Q@mail.gmail.com>
In-Reply-To: <CAOc6etY0fyBnT9kMSm+s1LqfCsSV4RRppokuE5igme-M-cvW6g@mail.gmail.com>

On Wed, Apr 13, 2022 at 7:30 PM Edmundo Carmona Antoranz <eantoranz@gmail.com> wrote:

Show 17 quoted lines

>
> On Wed, Apr 13, 2022 at 7:26 PM <rsbecker@nexbridge.com> wrote:
> >
> > >2.35.1
> >
> > I'm sorry if I'm missing something here but how is this different from
> > cherry-pick A..B?
> > --Randall
> >
>
> Good question, but cherry-pick has troubles with merges:
>
> (same example, after amending):
> $ git cherry-pick v2.35.0..v2.36.0-rc1
> error: commit bb4921cf45e11d063e7bbe55f594adf8f0077d5d is a merge but
> no -m option was given.
> fatal: cherry-pick failed

By the way, Randall, it's not just _merges_. Correct me if I'm wrong but cherry-pick (or rebase) will run merges (in all their glory) to get code cherry-picked. What I want to do is skip merges/conflicts altogether by using the information of existing revisions (the ones we want to cherry-pick) just adjusting their parents to get the new revisions.

Let me know!