summaryrefslogtreecommitdiff
path: root/t/t6043-merge-rename-directories.sh
AgeCommit message (Expand)AuthorFilesLines
2019-12-01Merge branch 'en/doc-typofix'Libravatar Junio C Hamano1-3/+3
2019-11-10Fix spelling errors in comments of testcasesLibravatar Elijah Newren1-3/+3
2019-10-23t604[236]: do not run setup in separate testsLibravatar Elijah Newren1-202/+264
2019-10-23merge-recursive: fix merging a subdirectory into the root directoryLibravatar Elijah Newren1-0/+114
2019-08-06merge-recursive: avoid directory rename detection in recursive caseLibravatar Elijah Newren1-0/+111
2019-04-08merge-recursive: switch directory rename detection defaultLibravatar Elijah Newren1-53/+405
2019-04-08t6043: fix copied test description to match its purposeLibravatar Elijah Newren1-2/+2
2018-11-08t6036, t6043: increase code coverage for file collision handlingLibravatar Elijah Newren1-0/+37
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingLibravatar Elijah Newren1-9/+15
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsLibravatar Elijah Newren1-35/+48
2018-07-16t6000-t6999: fix broken &&-chainsLibravatar Eric Sunshine1-1/+1
2018-05-08merge-recursive: fix check for skipability of working tree updatesLibravatar Elijah Newren1-1/+1
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesLibravatar Elijah Newren1-30/+25
2018-05-08directory rename detection: new testcases showcasing a pair of bugsLibravatar Elijah Newren1-0/+296
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesLibravatar Elijah Newren1-4/+4
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren1-1/+1
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesLibravatar Elijah Newren1-3/+3
2018-05-08merge-recursive: apply necessary modifications for directory renamesLibravatar Elijah Newren1-25/+25
2018-05-08merge-recursive: check for file level conflicts then get new nameLibravatar Elijah Newren1-1/+1
2018-04-20directory rename detection: tests for handling overwriting dirty filesLibravatar Elijah Newren1-0/+458
2018-04-20directory rename detection: tests for handling overwriting untracked filesLibravatar Elijah Newren1-0/+367
2018-04-20directory rename detection: miscellaneous testcases to complete coverageLibravatar Elijah Newren1-1/+564
2018-04-20directory rename detection: testcases exploring possibly suboptimal mergesLibravatar Elijah Newren1-0/+404
2018-04-20directory rename detection: more involved edge/corner testcasesLibravatar Elijah Newren1-0/+396
2018-04-20directory rename detection: testcases checking which side did the renameLibravatar Elijah Newren1-0/+336
2018-04-20directory rename detection: files/directories in the way of some renamesLibravatar Elijah Newren1-0/+330
2018-04-20directory rename detection: partially renamed directory testcase/discussionLibravatar Elijah Newren1-0/+115
2018-04-20directory rename detection: testcases to avoid taking detection too farLibravatar Elijah Newren1-0/+153
2018-04-20directory rename detection: directory splitting testcasesLibravatar Elijah Newren1-0/+143
2018-04-20directory rename detection: basic testcasesLibravatar Elijah Newren1-0/+442
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Libravatar Junio C Hamano1-3998/+0
2018-02-27merge-recursive: ensure we write updates for directory-renamed fileLibravatar Elijah Newren1-1/+1
2018-02-27merge-recursive: avoid spurious rename/rename conflict from dir renamesLibravatar Elijah Newren1-30/+25
2018-02-27directory rename detection: new testcases showcasing a pair of bugsLibravatar Elijah Newren1-0/+296
2018-02-27merge-recursive: fix remaining directory rename + dirty overwrite casesLibravatar Elijah Newren1-4/+4
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren1-1/+1
2018-02-27merge-recursive: avoid clobbering untracked files with directory renamesLibravatar Elijah Newren1-3/+3
2018-02-27merge-recursive: apply necessary modifications for directory renamesLibravatar Elijah Newren1-25/+25
2018-02-14merge-recursive: check for file level conflicts then get new nameLibravatar Elijah Newren1-1/+1
2018-02-14directory rename detection: tests for handling overwriting dirty filesLibravatar Elijah Newren1-0/+458
2018-02-14directory rename detection: tests for handling overwriting untracked filesLibravatar Elijah Newren1-0/+367
2018-02-14directory rename detection: miscellaneous testcases to complete coverageLibravatar Elijah Newren1-1/+564
2018-02-14directory rename detection: testcases exploring possibly suboptimal mergesLibravatar Elijah Newren1-0/+404
2018-02-14directory rename detection: more involved edge/corner testcasesLibravatar Elijah Newren1-0/+396
2018-02-14directory rename detection: testcases checking which side did the renameLibravatar Elijah Newren1-0/+336
2018-02-14directory rename detection: files/directories in the way of some renamesLibravatar Elijah Newren1-0/+330
2018-02-14directory rename detection: partially renamed directory testcase/discussionLibravatar Elijah Newren1-0/+115
2018-02-14directory rename detection: testcases to avoid taking detection too farLibravatar Elijah Newren1-0/+153
2018-02-14directory rename detection: directory splitting testcasesLibravatar Elijah Newren1-0/+143
2018-02-14directory rename detection: basic testcasesLibravatar Elijah Newren1-0/+442
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 14:37:13 +0000