summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-08-14fast-import: prevent producing bad deltaLibravatar Dmitry Ivankov2-6/+31
2011-08-14fast-import: add a test for tree delta base corruptionLibravatar Dmitry Ivankov1-0/+41
2011-08-14merge-recursive: Don't re-sort a list whose order we depend uponLibravatar Elijah Newren1-4/+12
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destLibravatar Elijah Newren2-3/+22
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyLibravatar Elijah Newren1-0/+69
2011-08-14merge-recursive: Avoid unnecessary file rewritesLibravatar Elijah Newren2-9/+27
2011-08-14t6022: Additional tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+91
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesLibravatar Elijah Newren2-15/+21
2011-08-14t6022: Add testcase for spurious "refusing to lose untracked" messagesLibravatar Elijah Newren1-0/+26
2011-08-14t3030: fix accidental success in symlink renameLibravatar Jeff King1-2/+5
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addLibravatar Elijah Newren2-26/+58
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destLibravatar Elijah Newren2-3/+20
2011-08-14merge-recursive: Have conflict_rename_delete reuse modify/delete codeLibravatar Elijah Newren1-16/+30
2011-08-14merge-recursive: Make modify/delete handling code reusableLibravatar Elijah Newren2-36/+50
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsLibravatar Elijah Newren3-38/+32
2011-08-14merge-recursive: Create function for merging with branchname:file markersLibravatar Elijah Newren1-9/+33
2011-08-14merge-recursive: Record more data needed for merging with dual renamesLibravatar Elijah Newren1-3/+39
2011-08-14merge-recursive: Defer rename/rename(2to1) handling until process_entryLibravatar Elijah Newren1-42/+62
2011-08-14merge-recursive: Small cleanups for conflict_rename_rename_1to2Libravatar Elijah Newren1-33/+27
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseLibravatar Elijah Newren2-18/+14
2011-08-14merge-recursive: Introduce a merge_file convenience functionLibravatar Elijah Newren1-35/+37
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseLibravatar Elijah Newren2-16/+26
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itLibravatar Elijah Newren2-5/+18
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesLibravatar Elijah Newren3-8/+97
2011-08-14merge-recursive: Cleanup and consolidation of rename_conflict_infoLibravatar Elijah Newren1-68/+66
2011-08-14merge-recursive: Consolidate process_entry() and process_df_entry()Libravatar Elijah Newren1-131/+57
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionLibravatar Elijah Newren3-8/+25
2011-08-14merge-recursive: Add comments about handling rename/add-source casesLibravatar Elijah Newren1-0/+11
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadLibravatar Elijah Newren2-30/+57
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsLibravatar Elijah Newren2-2/+3
2011-08-14merge-recursive: Split update_stages_and_entry; only update stages at endLibravatar Elijah Newren1-18/+17
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesLibravatar Elijah Newren2-5/+23
2011-08-14string-list: Add API to remove an item from an unsorted listLibravatar Johannes Sixt3-0/+20
2011-08-14merge-recursive: Split was_tracked() out of would_lose_untracked()Libravatar Elijah Newren1-3/+8
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themLibravatar Elijah Newren2-16/+25
2011-08-14merge-recursive: Fix code checking for D/F conflicts still being presentLibravatar Elijah Newren1-15/+34
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsLibravatar Elijah Newren2-13/+53
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictLibravatar Elijah Newren2-2/+4
2011-08-14merge-recursive: Avoid working directory changes during recursive caseLibravatar Elijah Newren1-0/+7
2011-08-14merge-recursive: Remember to free generated unique path namesLibravatar Elijah Newren1-8/+12
2011-08-14merge-recursive: Consolidate different update_stages functionsLibravatar Elijah Newren1-18/+9
2011-08-14merge-recursive: Mark some diff_filespec struct arguments constLibravatar Elijah Newren1-9/+10
2011-08-14merge-recursive: Correct a commentLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Make BUG message more legible by adding a newlineLibravatar Elijah Newren1-1/+1
2011-08-14t6022: Add testcase for merging a renamed file with a simple changeLibravatar Elijah Newren1-0/+27
2011-08-14t6022: New tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+63
2011-08-14t6022: Remove unnecessary untracked files to make test cleanerLibravatar Elijah Newren1-0/+1
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 07:18:54 +0000