[jira] [Updated] (HIVE-17988) Replace patch utility usage with git apply in ptest

["Zoltan Haindrich (JIRA)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/HIVE-17988?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Zoltan Haindrich updated HIVE-17988:
------------------------------------
       Resolution: Fixed
    Fix Version/s: 3.0.0
           Status: Resolved  (was: Patch Available)

pushed to master. Thank you [~dvoros] for taking care of this!

> Replace patch utility usage with git apply in ptest
> ---------------------------------------------------
>
>                 Key: HIVE-17988
>                 URL: https://issues.apache.org/jira/browse/HIVE-17988
>             Project: Hive
>          Issue Type: Improvement
>          Components: Testing Infrastructure
>            Reporter: Zoltan Haindrich
>            Assignee: Daniel Voros
>             Fix For: 3.0.0
>
>         Attachments: HIVE-17988.1.patch, HIVE-17988.2.patch
>
>
> 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.
> {code}
> 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.
> {code}



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)