git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 00/20] fundamentals of merge-ort implementation

From
Elijah Newren <newren@gmail.com>
Date
Nov 29, 2020, 07:47 UTC
Message-ID
<CABPp-BFnzOmJ=7DBXufEDbvqUfJGiKXsAqYdnBe9oTGcMotZ-Q@mail.gmail.com>
In-Reply-To
<pull.923.git.git.1606635803.gitgitgadget@gmail.com>

On Sat, Nov 28, 2020 at 11:43 PM Elijah Newren via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 6 quoted lines
>
> This is actually v3 of this series; but v2 depended on two topics that
> hadn't graduated yet so I couldn't easily use gitgitgadget and get its
> testing. Now that the topics have graduated, I have rebased on master. You
> can see v2 and comments on it over here:
> https://lore.kernel.org/git/20201102204344.342633-1-newren@gmail.com/

Oops, I forgot to CC my two great reviewers of previous rounds. Fixing that now...

Previous: Elijah Newren via GitGitGadgetNext: Elijah Newren via GitGitGadget
Message 26 of 70 in “fundamentals of merge-ort implementation”
  1. 00/20 fundamentals of merge-ort implementationElijah Newren via GitGitGadget, Nov 29, 2020
  2. 03/20 merge-ort: port merge_start() from merge-recursiveElijah Newren via GitGitGadget, Nov 29, 2020
  3. 02/20 merge-ort: add some high-level algorithm structureElijah Newren via GitGitGadget, Nov 29, 2020
  4. 04/20 merge-ort: use histogram diffElijah Newren via GitGitGadget, Nov 29, 2020
  5. 01/20 merge-ort: setup basic internal data structuresElijah Newren via GitGitGadget, Nov 29, 2020
  6. 07/20 merge-ort: avoid repeating fill_tree_descriptor() on the same treeElijah Newren via GitGitGadget, Nov 29, 2020
  7. 05/20 merge-ort: add an err() function similar to one from merge-recursiveElijah Newren via GitGitGadget, Nov 29, 2020
  8. Ævar Arnfjörð BjarmasonNov 29, 2020
  9. Elijah NewrenNov 30, 2020
  10. Ævar Arnfjörð BjarmasonNov 29, 2020
  11. 10/20 merge-ort: avoid recursing into identical treesElijah Newren via GitGitGadget, Nov 29, 2020
  12. 08/20 merge-ort: compute a few more useful fields for collect_merge_infoElijah Newren via GitGitGadget, Nov 29, 2020
  13. 06/20 merge-ort: implement a very basic collect_merge_info()Elijah Newren via GitGitGadget, Nov 29, 2020
  14. 11/20 merge-ort: add a preliminary simple process_entries() implementationElijah Newren via GitGitGadget, Nov 29, 2020
  15. 12/20 merge-ort: have process_entries operate in a defined orderElijah Newren via GitGitGadget, Nov 29, 2020
  16. 14/20 merge-ort: step 2 of tree writing -- function to create tree objectElijah Newren via GitGitGadget, Nov 29, 2020
  17. 09/20 merge-ort: record stage and auxiliary info for every pathElijah Newren via GitGitGadget, Nov 29, 2020
  18. 15/20 merge-ort: step 3 of tree writing -- handling subdirectories as we goElijah Newren via GitGitGadget, Nov 29, 2020
  19. 16/20 merge-ort: basic outline for merge_switch_to_result()Elijah Newren via GitGitGadget, Nov 29, 2020
  20. 13/20 merge-ort: step 1 of tree writing -- record basenames, modes, and oidsElijah Newren via GitGitGadget, Nov 29, 2020
  21. 19/20 merge-ort: add implementation of record_conflicted_index_entries()Elijah Newren via GitGitGadget, Nov 29, 2020
  22. Ævar Arnfjörð BjarmasonNov 29, 2020
  23. 18/20 tree: enable cmp_cache_name_compare() to be used elsewhereElijah Newren via GitGitGadget, Nov 29, 2020
  24. 17/20 merge-ort: add implementation of checkout()Elijah Newren via GitGitGadget, Nov 29, 2020
  25. 20/20 merge-ort: free data structures in merge_finalize()Elijah Newren via GitGitGadget, Nov 29, 2020
  26. Elijah NewrenNov 29, 2020
  27. 00/20 fundamentals of merge-ort implementationElijah Newren via GitGitGadget, Dec 4, 2020
  28. 02/20 merge-ort: add some high-level algorithm structureElijah Newren via GitGitGadget, Dec 4, 2020
  29. 03/20 merge-ort: port merge_start() from merge-recursiveElijah Newren via GitGitGadget, Dec 4, 2020
  30. 01/20 merge-ort: setup basic internal data structuresElijah Newren via GitGitGadget, Dec 4, 2020
  31. 05/20 merge-ort: add an err() function similar to one from merge-recursiveElijah Newren via GitGitGadget, Dec 4, 2020
  32. 04/20 merge-ort: use histogram diffElijah Newren via GitGitGadget, Dec 4, 2020
  33. 15/20 merge-ort: step 3 of tree writing -- handling subdirectories as we goElijah Newren via GitGitGadget, Dec 4, 2020
  34. 14/20 merge-ort: step 2 of tree writing -- function to create tree objectElijah Newren via GitGitGadget, Dec 4, 2020
  35. 07/20 merge-ort: avoid repeating fill_tree_descriptor() on the same treeElijah Newren via GitGitGadget, Dec 4, 2020
  36. 09/20 merge-ort: record stage and auxiliary info for every pathElijah Newren via GitGitGadget, Dec 4, 2020
  37. 11/20 merge-ort: add a preliminary simple process_entries() implementationElijah Newren via GitGitGadget, Dec 4, 2020
  38. 10/20 merge-ort: avoid recursing into identical treesElijah Newren via GitGitGadget, Dec 4, 2020
  39. 08/20 merge-ort: compute a few more useful fields for collect_merge_infoElijah Newren via GitGitGadget, Dec 4, 2020
  40. 19/20 merge-ort: add implementation of record_conflicted_index_entries()Elijah Newren via GitGitGadget, Dec 4, 2020
  41. 18/20 tree: enable cmp_cache_name_compare() to be used elsewhereElijah Newren via GitGitGadget, Dec 4, 2020
  42. 12/20 merge-ort: have process_entries operate in a defined orderElijah Newren via GitGitGadget, Dec 4, 2020
  43. 13/20 merge-ort: step 1 of tree writing -- record basenames, modes, and oidsElijah Newren via GitGitGadget, Dec 4, 2020
  44. 06/20 merge-ort: implement a very basic collect_merge_info()Elijah Newren via GitGitGadget, Dec 4, 2020
  45. 17/20 merge-ort: add implementation of checkout()Elijah Newren via GitGitGadget, Dec 4, 2020
  46. 16/20 merge-ort: basic outline for merge_switch_to_result()Elijah Newren via GitGitGadget, Dec 4, 2020
  47. 20/20 merge-ort: free data structures in merge_finalize()Elijah Newren via GitGitGadget, Dec 4, 2020
  48. 00/20 fundamentals of merge-ort implementationElijah Newren via GitGitGadget, Dec 13, 2020
  49. 01/20 merge-ort: setup basic internal data structuresElijah Newren via GitGitGadget, Dec 13, 2020
  50. 04/20 merge-ort: use histogram diffElijah Newren via GitGitGadget, Dec 13, 2020
  51. 03/20 merge-ort: port merge_start() from merge-recursiveElijah Newren via GitGitGadget, Dec 13, 2020
  52. 02/20 merge-ort: add some high-level algorithm structureElijah Newren via GitGitGadget, Dec 13, 2020
  53. 08/20 merge-ort: compute a few more useful fields for collect_merge_infoElijah Newren via GitGitGadget, Dec 13, 2020
  54. 06/20 merge-ort: implement a very basic collect_merge_info()Elijah Newren via GitGitGadget, Dec 13, 2020
  55. 07/20 merge-ort: avoid repeating fill_tree_descriptor() on the same treeElijah Newren via GitGitGadget, Dec 13, 2020
  56. 05/20 merge-ort: add an err() function similar to one from merge-recursiveElijah Newren via GitGitGadget, Dec 13, 2020
  57. 10/20 merge-ort: avoid recursing into identical treesElijah Newren via GitGitGadget, Dec 13, 2020
  58. 14/20 merge-ort: step 2 of tree writing -- function to create tree objectElijah Newren via GitGitGadget, Dec 13, 2020
  59. 12/20 merge-ort: have process_entries operate in a defined orderElijah Newren via GitGitGadget, Dec 13, 2020
  60. 16/20 merge-ort: basic outline for merge_switch_to_result()Elijah Newren via GitGitGadget, Dec 13, 2020
  61. 09/20 merge-ort: record stage and auxiliary info for every pathElijah Newren via GitGitGadget, Dec 13, 2020
  62. 18/20 tree: enable cmp_cache_name_compare() to be used elsewhereElijah Newren via GitGitGadget, Dec 13, 2020
  63. 15/20 merge-ort: step 3 of tree writing -- handling subdirectories as we goElijah Newren via GitGitGadget, Dec 13, 2020
  64. 17/20 merge-ort: add implementation of checkout()Elijah Newren via GitGitGadget, Dec 13, 2020
  65. 19/20 merge-ort: add implementation of record_conflicted_index_entries()Elijah Newren via GitGitGadget, Dec 13, 2020
  66. 20/20 merge-ort: free data structures in merge_finalize()Elijah Newren via GitGitGadget, Dec 13, 2020
  67. 13/20 merge-ort: step 1 of tree writing -- record basenames, modes, and oidsElijah Newren via GitGitGadget, Dec 13, 2020
  68. 11/20 merge-ort: add a preliminary simple process_entries() implementationElijah Newren via GitGitGadget, Dec 13, 2020
  69. Felipe ContrerasDec 14, 2020
  70. Elijah NewrenDec 14, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.