You are viewing a plain text version of this content. The canonical link for it is here.

Posted to issues@phoenix.apache.org by "Istvan Toth (Jira)" <ji...@apache.org> on 2020/08/28 04:55:00 UTC

[jira] [Commented] (PHOENIX-6108) The patch does not appear to apply with p0 to p2 in PreCommit jenkins

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

Istvan Toth commented on PHOENIX-6108:
--------------------------------------

I have seen this message when a patch file contains multiple git commits. The precommit script cannot handle that.

The solution is to simply squash the commits before {{git format-patch}}. 

 

> The patch does not appear to apply with p0 to p2 in PreCommit jenkins
> ---------------------------------------------------------------------
>
>                 Key: PHOENIX-6108
>                 URL: https://issues.apache.org/jira/browse/PHOENIX-6108
>             Project: Phoenix
>          Issue Type: Bug
>            Reporter: Chao Wang
>            Priority: Minor
>
> I find a issue, if we submit more version patch,  multiple patches will interact with each other.   throw this error in Precommit jenkins in hadoop QA, which  is "The patch does not appear to apply with p0 to p2". if we delete more than one and leave only one patch, this patch is apply in 4.x bransh in Precommit jenkins.
> phoenix CI change a new QA jenkins recently, I guess if new jenkins have a problems.  I do not find this issue in old CI Environment previously.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)