@matheusbsbs / matheus-bagliano
Code Commits 81,972 Issues Pulls Cloud Agent CI/CD
jch
bisect jch maint master next seen test todo

merge-recursive: Record more data needed for merging with dual renames

Elijah Newren committed about 15 years ago

232c635f7e

merge-recursive: Defer rename/rename(2to1) handling until process_entry

Elijah Newren committed about 15 years ago

461f504117

merge-recursive: Small cleanups for conflict_rename_rename_1to2

Elijah Newren committed about 15 years ago

a99b7f2256

merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base

Elijah Newren committed about 15 years ago

c52ff85d97

merge-recursive: Introduce a merge_file convenience function

Elijah Newren committed about 15 years ago

6bdaead1e5

merge-recursive: Fix modify/delete resolution in the recursive case

Elijah Newren committed about 15 years ago

ec61d14963

merge-recursive: When we detect we can skip an update, actually skip it

Elijah Newren committed about 15 years ago

5b448b8530

merge-recursive: Provide more info in conflict markers with file renames

Elijah Newren committed about 15 years ago

3c217c077a

merge-recursive: Cleanup and consolidation of rename_conflict_info

Elijah Newren committed about 15 years ago

4f66dade81

merge-recursive: Consolidate process_entry() and process_df_entry()

Elijah Newren committed about 15 years ago

edd2faf52e

merge-recursive: Improve handling of rename target vs. directory addition

Elijah Newren committed about 15 years ago

51931bf08e

merge-recursive: Add comments about handling rename/add-source cases

Elijah Newren committed about 15 years ago

7769a75e96

merge-recursive: Make dead code for rename/rename(2to1) conflicts undead

Elijah Newren committed about 15 years ago

0a6b87126e

merge-recursive: Fix deletion of untracked file in rename/delete conflicts

Elijah Newren committed about 15 years ago

531357a4cc

merge-recursive: Split update_stages_and_entry; only update stages at end

Elijah Newren committed about 15 years ago

b8ddf16424

merge-recursive: Allow make_room_for_path() to remove D/F entries

Elijah Newren committed about 15 years ago

ed0148a520

string-list: Add API to remove an item from an unsorted list

Johannes Sixt committed about 15 years ago

86d4b528d8

merge-recursive: Split was_tracked() out of would_lose_untracked()

Elijah Newren committed about 15 years ago

aacb82de3f

merge-recursive: Save D/F conflict filenames instead of unlinking them

Elijah Newren committed about 15 years ago

70cc3d36eb

merge-recursive: Fix code checking for D/F conflicts still being present

Elijah Newren committed about 15 years ago

f2507b4e0e
← Newer Page 2779 of 4099 Older →