{"thread":{"id":"25864","subject":"[PATCH] git-gui: Fix use of renamed tag.","startedAt":"2010-11-29T08:21:57Z","lastAt":"2010-12-06T21:20:46Z","messageCount":2,"participants":["Bert Wesarg","Pat Thoyts"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"156789","messageId":"c24527d4bb9cdc1f72f27c2154d0320ee5579fa1.1291018765.git.bert.wesarg@googlemail.com","threadId":"25864","inReplyTo":null,"subject":"[PATCH] git-gui: Fix use of renamed tag.","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-11-29T08:21:57Z","receivedAt":"2010-11-29T08:21:57Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"The d======= was renamed to d= in 4590307.\n\nFix this.\n\nSigned-off-by: Bert Wesarg <bert.wesarg@googlemail.com>\n---\n lib/diff.tcl |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/lib/diff.tcl b/lib/diff.tcl\nindex 8fea947..7b1fddf 100644\n--- a/lib/diff.tcl\n+++ b/lib/diff.tcl\n@@ -122,22 +122,22 @@ proc show_unmerged_diff {cont_info} {\n \tif {$merge_stages(2) eq {}} {\n \t\tset is_conflict_diff 1\n \t\tlappend current_diff_queue \\\n-\t\t\t[list [mc \"LOCAL: deleted\\nREMOTE:\\n\"] d======= \\\n+\t\t\t[list [mc \"LOCAL: deleted\\nREMOTE:\\n\"] d= \\\n \t\t\t    [list \":1:$current_diff_path\" \":3:$current_diff_path\"]]\n \t} elseif {$merge_stages(3) eq {}} {\n \t\tset is_conflict_diff 1\n \t\tlappend current_diff_queue \\\n-\t\t\t[list [mc \"REMOTE: deleted\\nLOCAL:\\n\"] d======= \\\n+\t\t\t[list [mc \"REMOTE: deleted\\nLOCAL:\\n\"] d= \\\n \t\t\t    [list \":1:$current_diff_path\" \":2:$current_diff_path\"]]\n \t} elseif {[lindex $merge_stages(1) 0] eq {120000}\n \t\t|| [lindex $merge_stages(2) 0] eq {120000}\n \t\t|| [lindex $merge_stages(3) 0] eq {120000}} {\n \t\tset is_conflict_diff 1\n \t\tlappend current_diff_queue \\\n-\t\t\t[list [mc \"LOCAL:\\n\"] d======= \\\n+\t\t\t[list [mc \"LOCAL:\\n\"] d= \\\n \t\t\t    [list \":1:$current_diff_path\" \":2:$current_diff_path\"]]\n \t\tlappend current_diff_queue \\\n-\t\t\t[list [mc \"REMOTE:\\n\"] d======= \\\n+\t\t\t[list [mc \"REMOTE:\\n\"] d= \\\n \t\t\t    [list \":1:$current_diff_path\" \":3:$current_diff_path\"]]\n \t} else {\n \t\tstart_show_diff $cont_info\n-- \n1.7.3.2.1200.ge4bf6\n"},{"id":"157432","messageId":"87ipz6y4wh.fsf@fox.patthoyts.tk","threadId":"25864","inReplyTo":"c24527d4bb9cdc1f72f27c2154d0320ee5579fa1.1291018765.git.bert.wesarg@googlemail.com","subject":"Re: [PATCH] git-gui: Fix use of renamed tag.","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2010-12-06T21:20:46Z","receivedAt":"2010-12-06T21:20:46Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Bert Wesarg <bert.wesarg@googlemail.com> writes:\n\n>The d======= was renamed to d= in 4590307.\n>\n>Fix this.\n>\n>Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>\n>---\n> lib/diff.tcl |    8 ++++----\n> 1 files changed, 4 insertions(+), 4 deletions(-)\n>\n>diff --git a/lib/diff.tcl b/lib/diff.tcl\n>index 8fea947..7b1fddf 100644\n>--- a/lib/diff.tcl\n>+++ b/lib/diff.tcl\n>@@ -122,22 +122,22 @@ proc show_unmerged_diff {cont_info} {\n> \tif {$merge_stages(2) eq {}} {\n> \t\tset is_conflict_diff 1\n> \t\tlappend current_diff_queue \\\n>-\t\t\t[list [mc \"LOCAL: deleted\\nREMOTE:\\n\"] d======= \\\n>+\t\t\t[list [mc \"LOCAL: deleted\\nREMOTE:\\n\"] d= \\\n> \t\t\t    [list \":1:$current_diff_path\" \":3:$current_diff_path\"]]\n> \t} elseif {$merge_stages(3) eq {}} {\n> \t\tset is_conflict_diff 1\n> \t\tlappend current_diff_queue \\\n>-\t\t\t[list [mc \"REMOTE: deleted\\nLOCAL:\\n\"] d======= \\\n>+\t\t\t[list [mc \"REMOTE: deleted\\nLOCAL:\\n\"] d= \\\n> \t\t\t    [list \":1:$current_diff_path\" \":2:$current_diff_path\"]]\n> \t} elseif {[lindex $merge_stages(1) 0] eq {120000}\n> \t\t|| [lindex $merge_stages(2) 0] eq {120000}\n> \t\t|| [lindex $merge_stages(3) 0] eq {120000}} {\n> \t\tset is_conflict_diff 1\n> \t\tlappend current_diff_queue \\\n>-\t\t\t[list [mc \"LOCAL:\\n\"] d======= \\\n>+\t\t\t[list [mc \"LOCAL:\\n\"] d= \\\n> \t\t\t    [list \":1:$current_diff_path\" \":2:$current_diff_path\"]]\n> \t\tlappend current_diff_queue \\\n>-\t\t\t[list [mc \"REMOTE:\\n\"] d======= \\\n>+\t\t\t[list [mc \"REMOTE:\\n\"] d= \\\n> \t\t\t    [list \":1:$current_diff_path\" \":3:$current_diff_path\"]]\n> \t} else {\n> \t\tstart_show_diff $cont_info\n\nLooks correct. Thank you.\n-- \nPat Thoyts                            http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD\n"}]}