Details
-
Bug
-
Status: Resolved
-
Major
-
Resolution: Won't Fix
-
2.0.0-alpha, 3.0.0-alpha1
-
None
-
None
-
None
Description
TortoiseSVN/some versions of svn have added several mergeinfo props to Hadoop's svn files/dirs (list below).
We should propdel that unneeded property, and fix it up. This otherwise causes pain to those who backport with a simple root-dir-down command (svn merge -c num <url/path>).
We should also make sure to update the HowToCommit page on advising to avoid mergeinfo additions to prevent this from reoccurring.
Files affected are, from my propdel revert output earlier today:
Reverted '.' Reverted 'hadoop-hdfs-project' Reverted 'hadoop-hdfs-project/hadoop-hdfs' Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs' Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/java' Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode' Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs' Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary' Reverted 'hadoop-hdfs-project/hadoop-hdfs/src/main/native' Reverted 'hadoop-mapreduce-project' Reverted 'hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site' Reverted 'hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt' Reverted 'hadoop-mapreduce-project/conf' Reverted 'hadoop-mapreduce-project/CHANGES.txt' Reverted 'hadoop-mapreduce-project/src/test/mapred' Reverted 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs' Reverted 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs' Reverted 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc' Reverted 'hadoop-mapreduce-project/src/contrib' Reverted 'hadoop-mapreduce-project/src/contrib/eclipse-plugin' Reverted 'hadoop-mapreduce-project/src/contrib/block_forensics' Reverted 'hadoop-mapreduce-project/src/contrib/index' Reverted 'hadoop-mapreduce-project/src/contrib/data_join' Reverted 'hadoop-mapreduce-project/src/contrib/build-contrib.xml' Reverted 'hadoop-mapreduce-project/src/contrib/vaidya' Reverted 'hadoop-mapreduce-project/src/contrib/build.xml' Reverted 'hadoop-mapreduce-project/src/java' Reverted 'hadoop-mapreduce-project/src/webapps/job' Reverted 'hadoop-mapreduce-project/src/c++' Reverted 'hadoop-mapreduce-project/src/examples' Reverted 'hadoop-mapreduce-project/hadoop-mapreduce-examples' Reverted 'hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml' Reverted 'hadoop-mapreduce-project/bin' Reverted 'hadoop-common-project' Reverted 'hadoop-common-project/hadoop-common' Reverted 'hadoop-common-project/hadoop-common/src/test/core' Reverted 'hadoop-common-project/hadoop-common/src/main/java' Reverted 'hadoop-common-project/hadoop-common/src/main/docs' Reverted 'hadoop-common-project/hadoop-auth' Reverted 'hadoop-project' Reverted 'hadoop-project/src/site'
Proposed set of fix (from http://stackoverflow.com/questions/767418/remove-unnecessary-svnmergeinfo-properties):
svn propdel svn:mergeinfo -R svn revert . svn commit -m <appropriate message>
(To be done on branch-2 and trunk both)