{"thread":{"id":"26308","subject":"[PATCH] gitk: Update cherry-pick error message parsing","startedAt":"2011-01-19T19:45:00Z","lastAt":"2011-01-19T19:45:00Z","messageCount":1,"participants":["Anders Kaseorg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"159662","messageId":"alpine.DEB.2.02.1101191441430.23868@dr-wily.mit.edu","threadId":"26308","inReplyTo":null,"subject":"[PATCH] gitk: Update cherry-pick error message parsing","fromName":"Anders Kaseorg","fromEmail":"andersk@mit.edu","sentAt":"2011-01-19T19:45:00Z","receivedAt":"2011-01-19T19:45:00Z","isPatch":true,"sender":{"key":"andersk@mit.edu","avatar":"https://avatars.githubusercontent.com/u/26471?v=4"},"body":"Commit 981ff5c37ae20687c98d98c8689d5e89016026d2 changed the error\nmessage from git cherry-pick from\n    Automatic cherry-pick failed.  [...advice...]\nto\n    error: could not apply 7ab78c9... Do something neat.\n    [...advice...]\n\nUpdate gitk’s regex to match this, restoring the ability to launch git\ncitool to resolve conflicted cherry-picks.\n\nSigned-off-by: Anders Kaseorg <andersk@mit.edu>\n---\n gitk |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex 9cbc09d..a0f7816 100755\n--- a/gitk\n+++ b/gitk\n@@ -9063,7 +9063,7 @@ proc cherrypick {} {\n \t\t\tto file '%s'.\\nPlease commit, reset or stash\\\n \t\t\tyour changes and try again.\" $fname]\n \t} elseif {[regexp -line \\\n-\t\t       {^(CONFLICT \\(.*\\):|Automatic cherry-pick failed)} \\\n+\t\t       {^(CONFLICT \\(.*\\):|Automatic cherry-pick failed|error: could not apply)} \\\n \t\t       $err]} {\n \t    if {[confirm_popup [mc \"Cherry-pick failed because of merge\\\n \t\t\tconflict.\\nDo you wish to run git citool to\\\n-- \n1.7.4.rc1\n"}]}