{"thread":{"id":"7557","subject":"[PATCH 0/5] merge-recursive D/F conflict improvements","startedAt":"2007-04-07T14:39:21Z","lastAt":"2007-04-07T14:39:21Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"38844","messageId":"7vd52gckpy.fsf@assigned-by-dhcp.cox.net","threadId":"7557","inReplyTo":null,"subject":"[PATCH 0/5] merge-recursive D/F conflict improvements","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-07T14:39:21Z","receivedAt":"2007-04-07T14:39:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This series is on top of my \"read-tree-df\" topic, which is in\n'next'.\n\nThe part that are already in 'next' deal with switching branches\nwhen the current branch has a file (or symlink) where the\nswitched-to branch has a directory (or vice versa), and is about\nfixing \"git-read-tree -m -u A B\" 2-way merges.\n\nThis series deals with both \"git-read-tree -m u O A B\" 3-way\nmerges, and \"git-merge-recursive\".  It comes with tests, but\nbecause these two programs are really central part of everyday\nbranch growing (the other important part is the revision walking\nmachinery which is obviously the central part of archaeology), I\nwould really need help from people who have worked in this area\nfor extra sets of eyeballs.\n\n[PATCH 1/5]\nt1000: fix case table.\n\n\tThis one is immaterial; while working on 2/5, I wondered\n\twhy threeway_merge() did not handle case #10, and tried\n\tto fix it by adding a case.  Obviously it broke existing\n\ttests and I recalled that contrary to the case table\n\tpresented there, we decided that \"stays in one side\n\twhile the other side removes\" case could be a sign of\n\tthe path being renamed away and let the caller deal with\n\tit.  So this patch fixes the case table to match the\n\tdesign and the code.\n\n[PATCH 2/5]\nTreat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()\n\n[PATCH 3/5]\nmerge-recursive: do not barf on \"to be removed\" entries.\n\n[PATCH 4/5]\nmerge-recursive: handle D/F conflict case more carefully.\n\n[PATCH 5/5]\nt3030: merge-recursive backend test.\n"}]}