summaryrefslogtreecommitdiff
path: root/t/t6036-recursive-corner-cases.sh
AgeCommit message (Expand)AuthorFilesLines
2020-02-27merge-recursive: apply collision handling unification to recursive caseLibravatar Elijah Newren1-9/+30
2019-11-10Fix spelling errors in test commandsLibravatar Elijah Newren1-2/+2
2019-08-19merge-recursive: provide a better label for diff3 common ancestorLibravatar Elijah Newren1-3/+5
2018-12-01t6036: avoid non-portable "cp -a"Libravatar Carlo Marcelo Arenas Belón1-1/+1
2018-11-08t6036, t6043: increase code coverage for file collision handlingLibravatar Elijah Newren1-0/+51
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsLibravatar Elijah Newren1-9/+3
2018-11-08merge-recursive: fix rename/add conflict handlingLibravatar Elijah Newren1-11/+13
2018-11-08merge-recursive: increase marker length with depth of recursionLibravatar Elijah Newren1-0/+151
2018-11-08t6036, t6042: testcases for rename collision of already conflicting filesLibravatar Elijah Newren1-0/+194
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADLibravatar Elijah Newren1-4/+4
2018-08-02Merge branch 'en/t6036-merge-recursive-tests'Libravatar Junio C Hamano1-0/+451
2018-08-02Merge branch 'es/test-fixes'Libravatar Junio C Hamano1-7/+7
2018-07-16t6000-t6999: fix broken &&-chainsLibravatar Eric Sunshine1-3/+3
2018-07-12t6036: fix broken && chain in sub-shellLibravatar Ramsay Jones1-1/+1
2018-07-11t6036: add a failed conflict detection case: regular files, different modesLibravatar Elijah Newren1-0/+67
2018-07-06t6036: add lots of detail for directory/file conflicts in recursive caseLibravatar Elijah Newren1-55/+201
2018-07-03t6036: add a failed conflict detection case with conflicting typesLibravatar Elijah Newren1-0/+75
2018-07-03t6036: add a failed conflict detection case with submodule add/addLibravatar Elijah Newren1-0/+88
2018-07-03t6036: add a failed conflict detection case with submodule modify/modifyLibravatar Elijah Newren1-0/+88
2018-07-03t6036: add a failed conflict detection case with symlink add/addLibravatar Elijah Newren1-0/+66
2018-07-03t6036: add a failed conflict detection case with symlink modify/modifyLibravatar Elijah Newren1-0/+67
2018-07-03t6036: fix broken "merge fails but has appropriate contents" testsLibravatar Eric Sunshine1-4/+4
2018-05-28t6036: prefer test_when_finished to manual cleanup in following testLibravatar Elijah Newren1-10/+12
2018-05-28t6036, t6042: prefer test_cmp to sequences of testLibravatar Elijah Newren1-38/+71
2018-05-28t6036, t6042: prefer test_path_is_file, test_path_is_missingLibravatar Elijah Newren1-2/+2
2018-05-28t6036, t6042: use test_line_count instead of wc -lLibravatar Elijah Newren1-34/+68
2018-05-28t6036, t6042: use test_create_repo to keep tests independentLibravatar Elijah Newren1-402/+452
2016-05-17Merge branch 'jc/ll-merge-internal'Libravatar Junio C Hamano1-84/+2
2016-05-09t6036: remove pointless test that expects failureLibravatar Junio C Hamano1-83/+0
2016-05-09ll-merge: use a longer conflict marker for internal mergeLibravatar Junio C Hamano1-1/+2
2015-03-20t: use test_must_fail instead of hand-rolled blocksLibravatar Jeff King1-6/+1
2015-03-20t: fix trivial &&-chain breakageLibravatar Jeff King1-1/+1
2015-03-20t: fix severe &&-chain breakageLibravatar Jeff King1-1/+1
2014-03-31code and test: fix misuses of "nor"Libravatar Justin Lebar1-1/+1
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destLibravatar Elijah Newren1-1/+1
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyLibravatar Elijah Newren1-0/+69
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsLibravatar Elijah Newren1-28/+10
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseLibravatar Elijah Newren1-2/+2
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadLibravatar Elijah Newren1-8/+9
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictLibravatar Elijah Newren1-2/+2
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyLibravatar Elijah Newren1-0/+77
2011-08-14t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyLibravatar Elijah Newren1-0/+88
2011-08-14t6036: tests for criss-cross merges with various directory/file conflictsLibravatar Elijah Newren1-0/+159
2011-08-14t6036: criss-cross with weird content can fool git into clean mergeLibravatar Elijah Newren1-0/+83
2011-08-14t6036: Add differently resolved modify/delete conflict in criss-cross testLibravatar Elijah Newren1-0/+83
2011-08-14t6042: Add a testcase where git deletes an untracked fileLibravatar Elijah Newren1-1/+1
2010-11-29Merge branch 'en/merge-recursive'Libravatar Junio C Hamano1-3/+182
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:24:08 +0000