hadoop-common-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Robert Joseph Evans (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (HADOOP-7598) smart-apply-patch.sh does not handle patching from a sub directory correctly.
Date Thu, 01 Sep 2011 14:47:09 GMT

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

Robert Joseph Evans commented on HADOOP-7598:
---------------------------------------------

I looked even deeper and found that the issue was caused because I deleted the end of an XML
comment in my patch.  So
{code}
-->
{code}

got turned into

{code}
--->
{code}

in the patch file.  This is what produced the blank lines and caused the error.  Sadly with
regular expressions there is no simple way to get all of the files out of a patch file because
there is always the possibility that someone will add in a line

{code}
++ /foo/bar
{code}

or delete a line

{code}
-- /foo/bar
{code}

That will mess them up.  I think the simplest way to get the proper P level is to run patch
with several different p levels and see which one actually applies.  If none of them apply
then you know it will not work.

> smart-apply-patch.sh does not handle patching from a sub directory correctly.
> -----------------------------------------------------------------------------
>
>                 Key: HADOOP-7598
>                 URL: https://issues.apache.org/jira/browse/HADOOP-7598
>             Project: Hadoop Common
>          Issue Type: Bug
>          Components: build
>    Affects Versions: 0.23.0, 0.24.0
>            Reporter: Robert Joseph Evans
>            Assignee: Robert Joseph Evans
>             Fix For: 0.23.0, 0.24.0
>
>         Attachments: HADOOP-7598-v1.patch, HADOOP-7598-v2.patch
>
>
> smart-apply-patch.sh does not apply valid patches from trunk, or from git like it was
designed to do in some situations.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

Mime
View raw message