summaryrefslogtreecommitdiff
path: root/t/t6423-merge-rename-directories.sh
AgeCommit message (Expand)AuthorFilesLines
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costLibravatar Elijah Newren1-1/+1
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Libravatar Junio C Hamano1-0/+175
2021-07-16Merge branch 'en/ort-perf-batch-12'Libravatar Junio C Hamano1-1/+1
2021-06-30merge-recursive: handle rename-to-self caseLibravatar Elijah Newren1-3/+3
2021-06-30merge-ort: ensure we consult df_conflict and path_conflictsLibravatar Elijah Newren1-3/+3
2021-06-30t6423: test directory renames causing rename-to-selfLibravatar Elijah Newren1-0/+175
2021-06-14Merge branch 'en/ort-perf-batch-11'Libravatar Junio C Hamano1-0/+58
2021-06-09Fix various issues found in commentsLibravatar Elijah Newren1-1/+1
2021-05-04t6423: rename file within directory that other side renamedLibravatar Elijah Newren1-0/+58
2021-04-16Merge branch 'en/ort-readiness'Libravatar Junio C Hamano1-1/+1
2021-04-08Merge branch 'en/ort-perf-batch-9'Libravatar Junio C Hamano1-0/+71
2021-03-20t6423: mark remaining expected failure under merge-ort as suchLibravatar Elijah Newren1-1/+1
2021-03-10merge-ort: precompute subset of sources for which we need rename detectionLibravatar Elijah Newren1-0/+71
2021-02-10tests: remove most uses of C_LOCALE_OUTPUTLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2020-10-26t6423: add more details about direct resolution of directoriesLibravatar Elijah Newren1-16/+23
2020-10-26t6423: note improved ort handling with untracked filesLibravatar Elijah Newren1-71/+124
2020-10-26t6423, t6436: note improved ort handling with dirty filesLibravatar Elijah Newren1-114/+152
2020-10-26t6423: expect improved conflict markers labels in the ort backendLibravatar Elijah Newren1-10/+28
2020-10-26t6404, t6423: expect improved rename/delete handling in ort backendLibravatar Elijah Newren1-20/+50
2020-10-26merge tests: expect improved directory/file conflict handling in ortLibravatar Elijah Newren1-15/+38
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveLibravatar Elijah Newren1-6/+7
2020-10-16t6423: more involved rules for renaming directories into each otherLibravatar Elijah Newren1-26/+227
2020-10-16t6423: update directory rename detection tests with new ruleLibravatar Elijah Newren1-21/+123
2020-10-16t6423: more involved directory rename testLibravatar Elijah Newren1-0/+195
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesLibravatar Elijah Newren1-2/+2
2020-08-10t6423: add an explanation about why one of the tests does not passLibravatar Elijah Newren1-0/+8
2020-08-10t6416, t6423: clarify some comments and fix some typosLibravatar Elijah Newren1-13/+12
2020-08-10t6423: fix test setup for a couple testsLibravatar Elijah Newren1-0/+2
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+4693
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 14:38:55 +0000