summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)AuthorFilesLines
2021-01-20Merge branch 'en/ort-directory-rename' into en/merge-ort-perfLibravatar Junio C Hamano1-22/+1228
2021-01-20merge-ort: fix a directory rename detection bugLibravatar Elijah Newren1-117/+81
2021-01-20merge-ort: process_renames() now needs more defensivenessLibravatar Elijah Newren1-5/+21
2021-01-20merge-ort: implement apply_directory_rename_modifications()Libravatar Elijah Newren1-1/+167
2021-01-20merge-ort: add a new toplevel_dir fieldLibravatar Elijah Newren1-6/+9
2021-01-20merge-ort: implement handle_path_level_conflicts()Libravatar Elijah Newren1-1/+71
2021-01-20merge-ort: implement check_for_directory_rename()Libravatar Elijah Newren1-1/+66
2021-01-20merge-ort: implement apply_dir_rename() and check_dir_renamed()Libravatar Elijah Newren1-2/+35
2021-01-20merge-ort: implement compute_collisions()Libravatar Elijah Newren1-1/+67
2021-01-20merge-ort: modify collect_renames() for directory rename handlingLibravatar Elijah Newren1-4/+74
2021-01-20merge-ort: implement handle_directory_level_conflicts()Libravatar Elijah Newren1-1/+18
2021-01-20merge-ort: implement compute_rename_counts()Libravatar Elijah Newren1-2/+52
2021-01-20merge-ort: copy get_renamed_dir_portion() from merge-recursive.cLibravatar Elijah Newren1-0/+104
2021-01-20merge-ort: add outline of get_provisional_directory_renames()Libravatar Elijah Newren1-1/+56
2021-01-20merge-ort: add outline for computing directory renamesLibravatar Elijah Newren1-1/+24
2021-01-14Merge branch 'en/ort-conflict-handling' into en/merge-ort-perfLibravatar Junio C Hamano1-18/+653
2021-01-07merge-ort: collect which directories are removed in dirs_removedLibravatar Elijah Newren1-0/+27
2021-01-07merge-ort: initialize and free new directory rename data structuresLibravatar Elijah Newren1-0/+35
2021-01-07merge-ort: add new data structures for directory rename detectionLibravatar Elijah Newren1-3/+31
2021-01-07Merge branch 'en/merge-ort-3' into en/ort-directory-renameLibravatar Junio C Hamano1-16/+430
2021-01-04merge-ort: add handling for different types of files at same pathLibravatar Elijah Newren1-4/+103
2021-01-04merge-ort: copy find_first_merges() implementation from merge-recursive.cLibravatar Elijah Newren1-1/+56
2021-01-04merge-ort: implement format_commit()Libravatar Elijah Newren1-1/+13
2021-01-04merge-ort: copy and adapt merge_submodule() from merge-recursive.cLibravatar Elijah Newren1-1/+125
2021-01-04merge-ort: copy and adapt merge_3way() from merge-recursive.cLibravatar Elijah Newren1-1/+53
2021-01-04merge-ort: flesh out implementation of handle_content_merge()Libravatar Elijah Newren1-6/+143
2021-01-04merge-ort: handle book-keeping around two- and three-way content mergeLibravatar Elijah Newren1-11/+41
2021-01-04merge-ort: implement unique_path() helperLibravatar Elijah Newren1-1/+24
2021-01-04merge-ort: handle directory/file conflicts that remainLibravatar Elijah Newren1-2/+84
2021-01-04merge-ort: handle D/F conflict where directory disappears due to mergeLibravatar Elijah Newren1-1/+22
2020-12-16merge-ort: implement merge_incore_recursive()Libravatar Elijah Newren1-2/+88
2020-12-16merge-ort: make clear_internal_opts() aware of partial clearingLibravatar Elijah Newren1-6/+7
2020-12-16merge-ort: copy a few small helper functions from merge-recursive.cLibravatar Elijah Newren1-0/+20
2020-12-15merge-ort: add implementation of type-changed rename handlingLibravatar Elijah Newren1-3/+32
2020-12-15merge-ort: add implementation of normal rename handlingLibravatar Elijah Newren1-1/+5
2020-12-15merge-ort: add implementation of rename collisionsLibravatar Elijah Newren1-3/+51
2020-12-15merge-ort: add implementation of rename/delete conflictsLibravatar Elijah Newren1-8/+40
2020-12-15merge-ort: add implementation of both sides renaming differentlyLibravatar Elijah Newren1-3/+55
2020-12-15merge-ort: add implementation of both sides renaming identicallyLibravatar Elijah Newren1-2/+18
2020-12-14merge-ort: add basic outline for process_renames()Libravatar Elijah Newren1-1/+97
2020-12-14merge-ort: implement compare_pairs() and collect_renames()Libravatar Elijah Newren1-2/+33
2020-12-14merge-ort: implement detect_regular_renames()Libravatar Elijah Newren1-1/+31
2020-12-14merge-ort: add initial outline for basic rename detectionLibravatar Elijah Newren1-8/+60
2020-12-14merge-ort: add basic data structures for handling renamesLibravatar Elijah Newren1-0/+24
2020-12-13merge-ort: add modify/delete handling and delayed output processingLibravatar Elijah Newren1-2/+98
2020-12-13merge-ort: add die-not-implemented stub handle_content_merge() functionLibravatar Elijah Newren1-0/+14
2020-12-13merge-ort: add function grouping commentsLibravatar Elijah Newren1-0/+21
2020-12-13merge-ort: add a paths_to_free field to merge_options_internalLibravatar Elijah Newren1-1/+25
2020-12-13merge-ort: add a path_conflict field to merge_options_internalLibravatar Elijah Newren1-0/+7
2020-12-13merge-ort: add a clear_internal_opts helperLibravatar Elijah Newren1-16/+24
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 19:34:00 +0000