Platform_Mirocod

12893 Commits

14 Branches

154 Tags

505 MiB

Tree: f3340f9234

Commit Graph

Author	SHA1	Message	Date
zeripath	f1e85622da	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004 ) The current TestPatch conflict code uses a plain git apply which does not properly account for 3-way merging. However, we can improve things using `git read-tree -m` to do a three-way merge then follow the algorithm used in merge-one-file. We can also use `--patience` and/or `--histogram` to generate a nicer diff for applying patches too. Fix #13679 Fix #6417 Signed-off-by: Andrew Thornton <art27@cantab.net>	3 years ago

Author

SHA1

Message

Date

zeripath

f1e85622da

Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004 )

The current TestPatch conflict code uses a plain git apply which does not properly
account for 3-way merging. However, we can improve things using `git read-tree -m` to
do a three-way merge then follow the algorithm used in merge-one-file. We can also use 
`--patience` and/or `--histogram` to generate a nicer diff for applying patches too.

Fix #13679
Fix #6417

Signed-off-by: Andrew Thornton <art27@cantab.net>

3 years ago

1 Commits (f3340f923444b1c4e960ef71c6b1fcd79ce42005)