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

["Daniel Voros (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/HIVE-17988?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16274161#comment-16274161 ] 

Daniel Voros commented on HIVE-17988:
-------------------------------------

[~spena] thank you for taking a look! That file is part of the Yetus integration introduced in HIVE-15051 and if I'm not mistaken it doesn't use the patch utility to apply the patches, so I think there's no need to modify around that.

> 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
>         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)