Show patches with: Submitter = Elijah Newren       |    State = Action Required       |    Archived = No       |   148 patches
« 1 2 »
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v4,3/3] merge-ort: begin performance work; instrument with trace2_region_* calls And so it begins...merge/rename performance work 1 - - --- 2021-01-24 Elijah Newren New
[v4,2/3] merge-ort: ignore the directory rename split conflict for now And so it begins...merge/rename performance work - - - --- 2021-01-24 Elijah Newren New
[v4,1/3] merge-ort: fix massive leak And so it begins...merge/rename performance work - - - --- 2021-01-24 Elijah Newren New
[v3,17/17] merge-ort: fix a directory rename detection bug Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,16/17] merge-ort: process_renames() now needs more defensiveness Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,15/17] merge-ort: implement apply_directory_rename_modifications() Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,14/17] merge-ort: add a new toplevel_dir field Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,13/17] merge-ort: implement handle_path_level_conflicts() Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,12/17] merge-ort: implement check_for_directory_rename() Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,11/17] merge-ort: implement apply_dir_rename() and check_dir_renamed() Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,10/17] merge-ort: implement compute_collisions() Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,09/17] merge-ort: modify collect_renames() for directory rename handling Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,08/17] merge-ort: implement handle_directory_level_conflicts() Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,07/17] merge-ort: implement compute_rename_counts() Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,06/17] merge-ort: copy get_renamed_dir_portion() from merge-recursive.c Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,05/17] merge-ort: add outline of get_provisional_directory_renames() Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,04/17] merge-ort: add outline for computing directory renames Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,03/17] merge-ort: collect which directories are removed in dirs_removed Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,02/17] merge-ort: initialize and free new directory rename data structures Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,01/17] merge-ort: add new data structures for directory rename detection Add directory rename detection to merge-ort - - - --- 2021-01-19 Elijah Newren New
[v3,1/1] merge-ort: begin performance work; instrument with trace2_region_* calls And so it begins...merge/rename performance work 1 - - --- 2021-01-15 Elijah Newren New
[18/18] DO NOT SUBMIT: directory rename stuff for redo_after_renames Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[17/18] merge-ort: fix a directory rename detection bug Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[16/18] merge-ort: process_renames() now needs more defensiveness Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[15/18] merge-ort: implement apply_directory_rename_modifications() Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[14/18] merge-ort: add a new toplevel_dir field Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[13/18] merge-ort: implement handle_path_level_conflicts() Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[12/18] merge-ort: implement check_for_directory_rename() Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[11/18] merge-ort: implement apply_dir_rename() and check_dir_renamed() Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[10/18] merge-ort: implement compute_collisions() Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[09/18] merge-ort: modify collect_renames() for directory rename handling Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[08/18] merge-ort: implement handle_directory_level_conflicts() Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[07/18] merge-ort: implement compute_rename_counts() Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[06/18] merge-ort: copy get_renamed_dir_portion() from merge-recursive.c Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[05/18] merge-ort: add outline of get_provisional_directory_renames() Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[04/18] merge-ort: add outline for computing directory renames Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[03/18] merge-ort: collect which directories are removed in dirs_removed Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[02/18] merge-ort: initialize and free new directory rename data structures Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[01/18] merge-ort: add new data structures for directory rename detection Add directory rename detection to merge-ort - - - --- 2021-01-07 Elijah Newren New
[v2,10/10] merge-ort: add handling for different types of files at same path merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,09/10] merge-ort: copy find_first_merges() implementation from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,08/10] merge-ort: implement format_commit() merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,07/10] merge-ort: copy and adapt merge_submodule() from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,06/10] merge-ort: copy and adapt merge_3way() from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,05/10] merge-ort: flesh out implementation of handle_content_merge() merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,04/10] merge-ort: handle book-keeping around two- and three-way content merge merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,03/10] merge-ort: implement unique_path() helper merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,02/10] merge-ort: handle directory/file conflicts that remain merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v2,01/10] merge-ort: handle D/F conflict where directory disappears due to merge merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren New
[v4,3/3] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren New
[v4,2/3] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren New
[v4,1/3] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren New
[v2,20/20] merge-ort: free data structures in merge_finalize() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,19/20] merge-ort: add implementation of record_conflicted_index_entries() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,18/20] tree: enable cmp_cache_name_compare() to be used elsewhere [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,17/20] merge-ort: add implementation of checkout() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,16/20] merge-ort: basic outline for merge_switch_to_result() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,15/20] merge-ort: step 3 of tree writing -- handling subdirectories as we go [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,14/20] merge-ort: step 2 of tree writing -- function to create tree object [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,12/20] merge-ort: have process_entries operate in a defined order [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,11/20] merge-ort: add a preliminary simple process_entries() implementation [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,10/20] merge-ort: avoid recursing into identical trees [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,09/20] merge-ort: record stage and auxiliary info for every path [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,08/20] merge-ort: compute a few more useful fields for collect_merge_info [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,07/20] merge-ort: avoid repeating fill_tree_descriptor() on the same tree [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,06/20] merge-ort: implement a very basic collect_merge_info() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,05/20] merge-ort: add an err() function similar to one from merge-recursive [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,04/20] merge-ort: use histogram diff [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,03/20] merge-ort: port merge_start() from merge-recursive [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,02/20] merge-ort: add some high-level algorithm structure [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,01/20] merge-ort: setup basic internal data structures [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[7/7] merge-ort: add modify/delete handling and delayed output processing merge-ort: some groundwork for further implementation - - - --- 2020-12-03 Elijah Newren New
[6/7] merge-ort: add die-not-implemented stub handle_content_merge() function merge-ort: some groundwork for further implementation - - - --- 2020-12-03 Elijah Newren New
[5/7] merge-ort: add function grouping comments merge-ort: some groundwork for further implementation - - - --- 2020-12-03 Elijah Newren New
[4/7] merge-ort: add a paths_to_free field to merge_options_internal merge-ort: some groundwork for further implementation - - - --- 2020-12-03 Elijah Newren New
[3/7] merge-ort: add a path_conflict field to merge_options_internal merge-ort: some groundwork for further implementation - - - --- 2020-12-03 Elijah Newren New
[2/7] merge-ort: add a clear_internal_opts helper merge-ort: some groundwork for further implementation - - - --- 2020-12-03 Elijah Newren New
[1/7] merge-ort: add a few includes merge-ort: some groundwork for further implementation - - - --- 2020-12-03 Elijah Newren New
[v2,3/3] stash: fix stash application in sparse-checkouts Fix stash apply in sparse checkouts (and a submodule test) - - - --- 2020-12-01 Elijah Newren New
[v2,2/3] stash: remove unnecessary process forking Fix stash apply in sparse checkouts (and a submodule test) - - - --- 2020-12-01 Elijah Newren New
[v2,1/3] t7012: add a testcase demonstrating stash apply bugs in sparse checkouts Fix stash apply in sparse checkouts (and a submodule test) - - - --- 2020-12-01 Elijah Newren New
[20/20] merge-ort: free data structures in merge_finalize() fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[19/20] merge-ort: add implementation of record_conflicted_index_entries() fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[18/20] tree: enable cmp_cache_name_compare() to be used elsewhere fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[17/20] merge-ort: add implementation of checkout() fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[16/20] merge-ort: basic outline for merge_switch_to_result() fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[15/20] merge-ort: step 3 of tree writing -- handling subdirectories as we go fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[14/20] merge-ort: step 2 of tree writing -- function to create tree object fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[12/20] merge-ort: have process_entries operate in a defined order fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[11/20] merge-ort: add a preliminary simple process_entries() implementation fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[10/20] merge-ort: avoid recursing into identical trees fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[09/20] merge-ort: record stage and auxiliary info for every path fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[08/20] merge-ort: compute a few more useful fields for collect_merge_info fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[07/20] merge-ort: avoid repeating fill_tree_descriptor() on the same tree fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[06/20] merge-ort: implement a very basic collect_merge_info() fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[05/20] merge-ort: add an err() function similar to one from merge-recursive fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[04/20] merge-ort: use histogram diff fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
[03/20] merge-ort: port merge_start() from merge-recursive fundamentals of merge-ort implementation - - - --- 2020-11-29 Elijah Newren New
« 1 2 »