{"thread":{"id":"19263","subject":"cosmetic bug in gitk cherry-pick","startedAt":"2009-05-10T03:36:59Z","lastAt":"2009-05-10T03:36:59Z","messageCount":1,"participants":["Peter Cordes"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113440","messageId":"20090510033659.GC7193@cordes.ca","threadId":"19263","inReplyTo":null,"subject":"cosmetic bug in gitk cherry-pick","fromName":"Peter Cordes","fromEmail":"peter@cordes.ca","sentAt":"2009-05-10T03:36:59Z","receivedAt":"2009-05-10T03:36:59Z","isPatch":false,"sender":{"key":"peter@cordes.ca","avatar":null},"body":" If a cherry-pick requires conflict resolution, gitk does:\nif {[confirm_popup [mc \"Cherry-pick failed because of merge\\\n                        conflict.\\nDo you wish to run git citool to\\\n                        resolve it?\"]]} {\n\n That gives the user a Yes/Cancel dialog, but in this case Cancel\nreally means \"No, don't run anything\", _not_ cancel the cherry-pick.\nSo IMHO, it would be better if the dialog options were Yes/No.\n\n If you added the button text as parameters to the confirm_popup\nfunction, you'd have to pass it the default strings everywhere, and\nthe extra visual noise of all that would probably make this bug not\nworth fixing.\n\n Unless tcl supports functions with default arguments, like C++'s\nint foo(int i, int j=42);  Unfortunately I don't know tcl.\n\n git (with gitk and git gui) is the best thing since emacs.  Happy\nhacking!\n\n-- \n#define X(x,y) x##y\nPeter Cordes ;  e-mail: X(peter@cor , des.ca)\n\n\"The gods confound the man who first found out how to distinguish the hours!\n Confound him, too, who in this place set up a sundial, to cut and hack\n my day so wretchedly into small pieces!\" -- Plautus, 200 BC\n"}]}