Mailing-List: contact common-issues-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-issues@hadoop.apache.org
Date: Thu, 1 Sep 2011 21:34:09 +0000 (UTC)
From: "Robert Joseph Evans (JIRA)" <jira@apache.org>
To: common-issues@hadoop.apache.org
Message-ID: <96658668.8488.1314912849863.JavaMail.tomcat@hel.zones.apache.org>
In-Reply-To: 
 <2124027744.4770.1314827650563.JavaMail.tomcat@hel.zones.apache.org>
Subject: [jira] [Commented] (HADOOP-7598) smart-apply-patch.sh does not
 handle patching from a sub directory correctly.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit


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

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

For me it does not

{noformat} 
patch --version
patch 2.5.4
Copyright 1984-1988 Larry Wall
Copyright 1989-1999 Free Software Foundation, Inc.

This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.

written by Larry Wall and Paul Eggert
{noformat} 

Outputs:
{noformat} 
--------------------------
|diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
|index c12c60c..b19b631 100644
|--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
|+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 42
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
{noformat}

at least for one of the patches I had issues with when trying to patch trunk

> 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, HADOOP-7598-v3.patch, HADOOP-7598-v4.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