* error: cannot cherry-pick during a revert
@ 2019-08-28 23:25 Mike Hommey
2019-08-29 15:27 ` Phillip Wood
0 siblings, 1 reply; 2+ messages in thread
From: Mike Hommey @ 2019-08-28 23:25 UTC (permalink / raw)
To: git
Hi,
This just happened to me while cherry-pick'ing:
$ git cherry-pick HEAD@{1}
error: could not apply 614fe5e629b84... try
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Recorded preimage for 'taskcluster/ci/build/linux.yml'
(... this is where I fix my conflict ...)
$ git add -u
$ git cherry-pick --continue
error: cannot cherry-pick during a revert.
fatal: cherry-pick failed
So apparently, cherry-pick thinks it was doing a revert when it hit a
conflict?
(This is with git 2.23)
Mike
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: error: cannot cherry-pick during a revert
2019-08-28 23:25 error: cannot cherry-pick during a revert Mike Hommey
@ 2019-08-29 15:27 ` Phillip Wood
0 siblings, 0 replies; 2+ messages in thread
From: Phillip Wood @ 2019-08-29 15:27 UTC (permalink / raw)
To: Mike Hommey, git
Hi Mike
On 29/08/2019 00:25, Mike Hommey wrote:
> Hi,
>
> This just happened to me while cherry-pick'ing:
>
> $ git cherry-pick HEAD@{1}
> error: could not apply 614fe5e629b84... try
> hint: after resolving the conflicts, mark the corrected paths
> hint: with 'git add <paths>' or 'git rm <paths>'
> hint: and commit the result with 'git commit'
> Recorded preimage for 'taskcluster/ci/build/linux.yml'
>
> (... this is where I fix my conflict ...)
>
> $ git add -u
> $ git cherry-pick --continue
> error: cannot cherry-pick during a revert.
> fatal: cherry-pick failed
Oh dear that's not good
> So apparently, cherry-pick thinks it was doing a revert when it hit a
> conflict?
>
> (This is with git 2.23)
I wondered if this was due to some of the recent changes adding --skip
to cherry-pick and revert but I can't see anything obvious at the
moment. To get that error the sequencer has loaded a todo file (in
read_populate_todo()) which starts with a revert command. Is it possible
you were reverting a sequence of commits before you ran the cherry-pick?
(a single pick or revert does not create a todo list). It could be that
there was an old todo list left over from a while ago - historically the
sequencer hasn't been all that good at cleaning up after itself if the
user committed the final pick or revert with 'git commit' and forgot to
run 'cherry-pick/revert --continue' afterwards.
Best Wishes
Phillip
> Mike
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-29 15:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-28 23:25 error: cannot cherry-pick during a revert Mike Hommey
2019-08-29 15:27 ` Phillip Wood
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).