{"thread":{"id":"51769","subject":"error: cannot cherry-pick during a revert","startedAt":"2019-08-28T23:25:20Z","lastAt":"2019-08-29T15:27:49Z","messageCount":2,"participants":["Mike Hommey","Phillip Wood"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"381480","messageId":"20190828232515.bvghqlwe3i7sie7n@glandium.org","threadId":"51769","inReplyTo":null,"subject":"error: cannot cherry-pick during a revert","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2019-08-28T23:25:15Z","receivedAt":"2019-08-28T23:25:20Z","isPatch":false,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"Hi,\n\nThis just happened to me while cherry-pick'ing:\n\n$ git cherry-pick HEAD@{1}\nerror: could not apply 614fe5e629b84... try\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\nRecorded preimage for 'taskcluster/ci/build/linux.yml'\n\n(... this is where I fix my conflict ...)\n\n$ git add -u\n$ git cherry-pick --continue \nerror: cannot cherry-pick during a revert.\nfatal: cherry-pick failed\n\nSo apparently, cherry-pick thinks it was doing a revert when it hit a\nconflict?\n\n(This is with git 2.23)\n\nMike\n"},{"id":"381516","messageId":"be3f951c-467d-68aa-592a-bdf77646fdbb@gmail.com","threadId":"51769","inReplyTo":"20190828232515.bvghqlwe3i7sie7n@glandium.org","subject":"Re: error: cannot cherry-pick during a revert","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-08-29T15:27:43Z","receivedAt":"2019-08-29T15:27:49Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Mike\n\nOn 29/08/2019 00:25, Mike Hommey wrote:\n> Hi,\n> \n> This just happened to me while cherry-pick'ing:\n> \n> $ git cherry-pick HEAD@{1}\n> error: could not apply 614fe5e629b84... try\n> hint: after resolving the conflicts, mark the corrected paths\n> hint: with 'git add <paths>' or 'git rm <paths>'\n> hint: and commit the result with 'git commit'\n> Recorded preimage for 'taskcluster/ci/build/linux.yml'\n> \n> (... this is where I fix my conflict ...)\n> \n> $ git add -u\n> $ git cherry-pick --continue\n> error: cannot cherry-pick during a revert.\n> fatal: cherry-pick failed\n\nOh dear that's not good\n\n> So apparently, cherry-pick thinks it was doing a revert when it hit a\n> conflict?\n> \n> (This is with git 2.23)\n\nI wondered if this was due to some of the recent changes adding --skip \nto cherry-pick and revert but I can't see anything obvious at the \nmoment. To get that error the sequencer has loaded a todo file (in \nread_populate_todo()) which starts with a revert command. Is it possible \nyou were reverting a sequence of commits before you ran the cherry-pick? \n(a single pick or revert does not create a todo list). It could be that \nthere was an old todo list left over from a while ago - historically the \nsequencer hasn't been all that good at cleaning up after itself if the \nuser committed the final pick or revert with 'git commit' and forgot to \nrun 'cherry-pick/revert --continue' afterwards.\n\nBest Wishes\n\nPhillip\n\n> Mike\n> \n"}]}