[HIVE-17988] Replace patch utility usage with git apply in ptest

• Type: Improvement
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 3.0.0
• Component/s: Testing Infrastructure
• Assignee: Daniel Voros
• Reporter: Zoltan Haindrich
• Created: 06/Nov/17 18:15
• Updated: 22/May/18 23:15
• Resolved: 04/Dec/17 08:47

Description

It would be great to replace the standard diff util because git can do a 3-way merge - which in most cases successfull.

This could reduce the ptest results which are erroring out because of build failure.

error: patch failed: ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java:7003
Falling back to three-way merge...
Applied patch to 'ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java' cleanly.