{"thread":{"id":"7558","subject":"[PATCH 1/5] t1000: fix case table.","startedAt":"2007-04-07T14:39:32Z","lastAt":"2007-04-07T18:01:45Z","messageCount":2,"participants":["Junio C Hamano","Daniel Barkalow"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"38845","messageId":"7vbqi0ckpn.fsf@assigned-by-dhcp.cox.net","threadId":"7558","inReplyTo":null,"subject":"[PATCH 1/5] t1000: fix case table.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-07T14:39:32Z","receivedAt":"2007-04-07T14:39:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Case #10 is not handled with unpack-trees.c:threeway_merge()\ninternally, unless under the agressive rule, and it is not a\nbug.  As the test expects, ND (one side did not do anything,\nother side deleted) case was meant to be handled by the caller's\npolicy (e.g. git-merge-one-file or git-merge-recursive).\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n t/t1000-read-tree-m-3way.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh\nindex e26a36c..de4e5eb 100755\n--- a/t/t1000-read-tree-m-3way.sh\n+++ b/t/t1000-read-tree-m-3way.sh\n@@ -184,7 +184,7 @@ checked.\n   9  exists  O!=A    missing   no merge    must match A and be\n                                            up-to-date, if exists.\n  ------------------------------------------------------------------\n- 10  exists  O==A    missing   remove      ditto\n+ 10  exists  O==A    missing   no merge    must match A\n  ------------------------------------------------------------------\n  11  exists  O!=A    O!=B      no merge    must match A and be\n                      A!=B                  up-to-date, if exists.\n-- \n1.5.1.81.gee969\n"},{"id":"38857","messageId":"Pine.LNX.4.64.0704071400190.27922@iabervon.org","threadId":"7558","inReplyTo":"7vbqi0ckpn.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH 1/5] t1000: fix case table.","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2007-04-07T18:01:45Z","receivedAt":"2007-04-07T18:01:45Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Sat, 7 Apr 2007, Junio C Hamano wrote:\n\n> Case #10 is not handled with unpack-trees.c:threeway_merge()\n> internally, unless under the agressive rule, and it is not a\n> bug.  As the test expects, ND (one side did not do anything,\n> other side deleted) case was meant to be handled by the caller's\n> policy (e.g. git-merge-one-file or git-merge-recursive).\n\nLooks like I neglected to update (or remove) that table; \nDocumentation/technical/trivial-merge.txt agrees with your change.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"}]}