Author: stevel
Date: Fri Jun 12 19:29:23 2009
New Revision: 784246
URL: http://svn.apache.org/viewvc?rev=784246&view=rev
Log:
HADOOP-3628 the targets to do the merge back
Modified:
hadoop/core/branches/HADOOP-3628-2/ivybuild.xml
Modified: hadoop/core/branches/HADOOP-3628-2/ivybuild.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-3628-2/ivybuild.xml?rev=784246&r1=784245&r2=784246&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-3628-2/ivybuild.xml (original)
+++ hadoop/core/branches/HADOOP-3628-2/ivybuild.xml Fri Jun 12 19:29:23 2009
@@ -281,5 +281,81 @@
<arg line="resolve"/>
</svn>
</target>
+
+ <!--
+ svn diff \
+ https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628-2\
+ https://svn.apache.org/repos/asf/hadoop/core/trunk
+ -->
+ <target name="svn-diff-trunk" depends="svn-init"
+ description="diff against trunk" >
+ <svn>
+ <arg value="diff" />
+ <arg
value="https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628-2"/>
+ <arg value="https://svn.apache.org/repos/asf/hadoop/core/trunk"/>
+ </svn>
+ </target>
+
+
+ <target name="svn-create-changelist" depends="svn-init"
+ description="Create a changelist of everything we want in the big patch" >
+ <property name="core/hadoop" value="src/core/org/apache/hadoop" />
+ <property name="hdfs/server"
+ value="src/hdfs/org/apache/hadoop/hdfs/server" />
+ <property name="hadoop/mapred"
+ value="src/mapred/org/apache/hadoop/mapred/" />
+ <property name="test/core"
+ value="src/test/org/apache/hadoop" />
+ <property name="test/hdfs/"
+ value="src/test/hdfs/org/apache/hadoop/hdfs" />
+ <property name="test/mapred"
+ value="src/test/mapred/org/apache/hadoop/mapred/" />
+
+ <svn>
+ <arg value="changelist"/>
+ <arg value="HADOOP-3628"/>
+ <!-- core -->
+ <arg value="${core/hadoop}/http/HttpServer.java" />
+ <!-- question this one -->
+ <!--
+ <arg value="${core/hadoop}/security/authorize/ConfiguredPolicy.java" />
+ -->
+ <arg value="${core/hadoop}/http/HttpServer.java" />
+ <arg value="${core/hadoop}/http/io/ThrowableWritable.java" />
+ <arg value="${core/hadoop}/util/Service.java" />
+ <arg value="${core/hadoop}/util/MockService.java" />
+
+ <arg value="${hdfs/server}/datanode/DataNode.java" />
+ <arg value="${hdfs/server}/datanode/FSDataset.java" />
+ <arg value="${hdfs/server}/namenode/BackupNode" />
+ <arg value="${hdfs/server}/namenode/FSNamesystem.java" />
+ <arg value="${hdfs/server}/namenode/NameNode.java" />
+ <arg value="${hdfs/server}/namenode/PendingReplicationBlocks.java" />
+ <arg value="${hadoop/mapred}/JobEndNotifier.java" />
+ <arg value="${hadoop/mapred}/JobTracker.java" />
+ <arg value="${hadoop/mapred}/TaskTracker.java" />
+ <arg value="${hadoop/mapred}/TaskTrackerAction.java" />
+ <arg value="${hadoop/mapred}/TaskTrackerStatus.java" />
+ <arg value="${test/core}/io/TestThrowableWritable.java" />
+ <arg value="${test/core}/util/TestServiceLifecycle.java" />
+ <arg value="${test/hdfs}/server/namenode/TestReplicationPolicy.java" />
+ <arg value="${test/mapred}/TestTaskTrackerLifecycle.java" />
+ </svn>
+ </target>
+
+
+ <!--
+ svn diff \
+ https://svn.apache.org/repos/asf/hadoop/core/trunk \
+ https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628-2
+ -->
+ <target name="svn-diff-trunk" depends="svn-init"
+ description="diff against trunk" >
+ <svn>
+ <arg value="diff" />
+ <arg value="https://svn.apache.org/repos/asf/hadoop/core/trunk"/>
+ <arg
value="https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-3628-2"/>
+ </svn>
+ </target>
</project>
\ No newline at end of file
