@matheusbsbs / matheus-bagliano
Fork 0
Code Commits 82,027 Issues Pulls Cloud Agent CICD
next
bisect jch maint master next seen test todo

conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts

Elijah Newren committed about 16 years ago

2adc7dcc11

conflict_rename_delete(): Check whether D/F conflicts are still present

Elijah Newren committed about 16 years ago

a0de2f6bd3

merge-recursive: Delay modify/delete conflicts if D/F conflict present

Elijah Newren committed about 16 years ago

71f7ffcc02

merge-recursive: Delay content merging for renames

Elijah Newren committed about 16 years ago

882fd11aff

merge-recursive: Delay handling of rename/delete conflicts

Elijah Newren committed about 16 years ago

3b130adf9c

merge-recursive: Move handling of double rename of one file to other file

Elijah Newren committed about 16 years ago

161cf7f949

merge-recursive: Move handling of double rename of one file to two

Elijah Newren committed about 16 years ago

07413c5a31

merge-recursive: Avoid doubly merging rename/add conflict contents

Elijah Newren committed about 16 years ago

2a669c341a

merge-recursive: Update merge_content() call signature

Elijah Newren committed about 16 years ago

61b8bcae2d

merge-recursive: Update conflict_rename_rename_1to2() call signature

Elijah Newren committed about 16 years ago

36de17048a

merge-recursive: Structure process_df_entry() to handle more cases

Elijah Newren committed about 16 years ago

9c0bbb50f0

merge-recursive: Have process_entry() skip D/F or rename entries

Elijah Newren committed about 16 years ago

384c166807

merge-recursive: New function to assist resolving renames in-core only

Elijah Newren committed about 16 years ago

2ff739f9d2

merge-recursive: New data structures for deferring of D/F conflicts

Elijah Newren committed about 16 years ago

25c3936349

merge-recursive: Move process_entry's content merging into a function

Elijah Newren committed about 16 years ago

0c4918d1c1

merge-recursive: Move delete/modify handling into dedicated function

Elijah Newren committed about 16 years ago

5e3ce663b0

merge-recursive: Move rename/delete handling into dedicated function

Elijah Newren committed about 16 years ago

6ef2cb008f

merge-recursive: Nuke rename/directory conflict detection

Elijah Newren committed about 16 years ago

605c1bcfc4

merge-recursive: Rename conflict_rename_rename*() for clarity

Elijah Newren committed about 16 years ago

09c01f856f

merge-recursive: Small code clarification -- variable name and comments

Elijah Newren committed about 16 years ago

41d70bd6a9
← Newer Page 2925 of 4102 Older →