summaryrefslogtreecommitdiff
path: root/t/t6423-merge-rename-directories.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-ort: restart merge with cached renames to reduce process entry costElijah Newren2021-07-201-1/+1
* Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano2021-07-161-0/+175
|\
| * merge-recursive: handle rename-to-self caseElijah Newren2021-06-301-3/+3
| * merge-ort: ensure we consult df_conflict and path_conflictsElijah Newren2021-06-301-3/+3
| * t6423: test directory renames causing rename-to-selfElijah Newren2021-06-301-0/+175
* | Merge branch 'en/ort-perf-batch-12'Junio C Hamano2021-07-161-1/+1
|\ \
| * | Fix various issues found in commentsElijah Newren2021-06-091-1/+1
* | | Merge branch 'en/ort-perf-batch-11'Junio C Hamano2021-06-141-0/+58
|\ \ \ | |/ / | | / | |/ |/|
| * t6423: rename file within directory that other side renamedElijah Newren2021-05-041-0/+58
* | Merge branch 'en/ort-readiness'Junio C Hamano2021-04-161-1/+1
|\ \ | |/
| * t6423: mark remaining expected failure under merge-ort as suchElijah Newren2021-03-201-1/+1
* | Merge branch 'en/ort-perf-batch-9'Junio C Hamano2021-04-081-0/+71
|\ \ | |/
| * merge-ort: precompute subset of sources for which we need rename detectionElijah Newren2021-03-101-0/+71
* | tests: remove most uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason2021-02-101-1/+1
|/
* t6423: add more details about direct resolution of directoriesElijah Newren2020-10-261-16/+23
* t6423: note improved ort handling with untracked filesElijah Newren2020-10-261-71/+124
* t6423, t6436: note improved ort handling with dirty filesElijah Newren2020-10-261-114/+152
* t6423: expect improved conflict markers labels in the ort backendElijah Newren2020-10-261-10/+28
* t6404, t6423: expect improved rename/delete handling in ort backendElijah Newren2020-10-261-20/+50
* merge tests: expect improved directory/file conflict handling in ortElijah Newren2020-10-261-15/+38
* t/: new helper for tests that pass with ort but fail with recursiveElijah Newren2020-10-261-6/+7
* t6423: more involved rules for renaming directories into each otherElijah Newren2020-10-161-26/+227
* t6423: update directory rename detection tests with new ruleElijah Newren2020-10-161-21/+123
* t6423: more involved directory rename testElijah Newren2020-10-161-0/+195
* t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren2020-08-101-2/+2
* t6423: add an explanation about why one of the tests does not passElijah Newren2020-08-101-0/+8
* t6416, t6423: clarify some comments and fix some typosElijah Newren2020-08-101-13/+12
* t6423: fix test setup for a couple testsElijah Newren2020-08-101-0/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+4693
View Lorry Controller Status