merge-ort: add modify/delete handling and delayed output processing

Elijah Newren committed over 5 years ago

merge-ort: add die-not-implemented stub handle_content_merge() function

Elijah Newren committed over 5 years ago

merge-ort: add function grouping comments

Elijah Newren committed over 5 years ago

merge-ort: add a paths_to_free field to merge_options_internal

Elijah Newren committed over 5 years ago

merge-ort: add a path_conflict field to merge_options_internal

Elijah Newren committed over 5 years ago

merge-ort: add a clear_internal_opts helper

Elijah Newren committed over 5 years ago

merge-ort: add a few includes

Elijah Newren committed over 5 years ago

merge-ort: free data structures in merge_finalize()

Elijah Newren committed over 5 years ago

merge-ort: add implementation of record_conflicted_index_entries()

Elijah Newren committed over 5 years ago

tree: enable cmp_cache_name_compare() to be used elsewhere

Elijah Newren committed over 5 years ago

merge-ort: add implementation of checkout()

Elijah Newren committed over 5 years ago

merge-ort: basic outline for merge_switch_to_result()

Elijah Newren committed over 5 years ago

merge-ort: step 3 of tree writing -- handling subdirectories as we go

Elijah Newren committed over 5 years ago

merge-ort: step 2 of tree writing -- function to create tree object

Elijah Newren committed over 5 years ago

merge-ort: step 1 of tree writing -- record basenames, modes, and oids

Elijah Newren committed over 5 years ago

merge-ort: have process_entries operate in a defined order

Elijah Newren committed over 5 years ago

merge-ort: add a preliminary simple process_entries() implementation

Elijah Newren committed over 5 years ago

merge-ort: avoid recursing into identical trees

Elijah Newren committed over 5 years ago

merge-ort: record stage and auxiliary info for every path

Elijah Newren committed over 5 years ago

merge-ort: compute a few more useful fields for collect_merge_info

Elijah Newren committed over 5 years ago