summaryrefslogtreecommitdiff
path: root/t/t6423-merge-rename-directories.sh
AgeCommit message (Expand)Author
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costElijah Newren
2021-07-17Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano
2021-07-17Merge branch 'en/ort-perf-batch-12'Junio C Hamano
2021-06-30merge-recursive: handle rename-to-self caseElijah Newren
2021-06-30merge-ort: ensure we consult df_conflict and path_conflictsElijah Newren
2021-06-30t6423: test directory renames causing rename-to-selfElijah Newren
2021-06-14Merge branch 'en/ort-perf-batch-11'Junio C Hamano
2021-06-09Fix various issues found in commentsElijah Newren
2021-05-04t6423: rename file within directory that other side renamedElijah Newren
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano
2021-04-08Merge branch 'en/ort-perf-batch-9'Junio C Hamano
2021-03-20t6423: mark remaining expected failure under merge-ort as suchElijah Newren
2021-03-11merge-ort: precompute subset of sources for which we need rename detectionElijah Newren
2021-02-11tests: remove most uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason
2020-10-26t6423: add more details about direct resolution of directoriesElijah Newren
2020-10-26t6423: note improved ort handling with untracked filesElijah Newren
2020-10-26t6423, t6436: note improved ort handling with dirty filesElijah Newren
2020-10-26t6423: expect improved conflict markers labels in the ort backendElijah Newren
2020-10-26t6404, t6423: expect improved rename/delete handling in ort backendElijah Newren
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveElijah Newren
2020-10-16t6423: more involved rules for renaming directories into each otherElijah Newren
2020-10-16t6423: update directory rename detection tests with new ruleElijah Newren
2020-10-16t6423: more involved directory rename testElijah Newren
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren
2020-08-10t6423: add an explanation about why one of the tests does not passElijah Newren
2020-08-10t6416, t6423: clarify some comments and fix some typosElijah Newren
2020-08-10t6423: fix test setup for a couple testsElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren
generated by cgit v0.10.2-6-g49f6 at 2024-04-24 23:34:38 (GMT)