You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-issues@hadoop.apache.org by "Harsh J (JIRA)" <ji...@apache.org> on 2012/06/30 19:20:43 UTC
[jira] [Commented] (HADOOP-8435) Propdel all svn:mergeinfo
[ https://issues.apache.org/jira/browse/HADOOP-8435?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13404574#comment-13404574 ]
Harsh J commented on HADOOP-8435:
---------------------------------
Here's a dry-run on trunk:
{code}
➜ trunk svn propdel svn:mergeinfo -R
property 'svn:mergeinfo' deleted from '.'.
property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs'.
property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs'.
property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/java'.
property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode'.
property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs'.
property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary'.
property 'svn:mergeinfo' deleted from 'hadoop-hdfs-project/hadoop-hdfs/src/main/native'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/conf'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/CHANGES.txt'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/eclipse-plugin'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/block_forensics'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/index'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/data_join'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/build-contrib.xml'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/vaidya'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/contrib/build.xml'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/java'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/webapps/job'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/c++'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/src/examples'.
property 'svn:mergeinfo' deleted from 'hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml'.
property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/CHANGES.txt'.
property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/test/core'.
property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/main/java'.
property 'svn:mergeinfo' deleted from 'hadoop-common-project/hadoop-common/src/main/docs'.
svn: Attempting to delete nonexistent property 'svn:mergeinfo'
➜ trunk svn revert .
Reverted '.'
➜ trunk svn st
M hadoop-hdfs-project/hadoop-hdfs
M hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs
M hadoop-hdfs-project/hadoop-hdfs/src/main/java
M hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode
M hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs
M hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary
M hadoop-hdfs-project/hadoop-hdfs/src/main/native
M hadoop-mapreduce-project
M hadoop-mapreduce-project/conf
M hadoop-mapreduce-project/CHANGES.txt
M hadoop-mapreduce-project/src/test/mapred
M hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs
M hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs
M hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc
M hadoop-mapreduce-project/src/contrib
M hadoop-mapreduce-project/src/contrib/eclipse-plugin
M hadoop-mapreduce-project/src/contrib/block_forensics
M hadoop-mapreduce-project/src/contrib/index
M hadoop-mapreduce-project/src/contrib/data_join
M hadoop-mapreduce-project/src/contrib/build-contrib.xml
M hadoop-mapreduce-project/src/contrib/vaidya
M hadoop-mapreduce-project/src/contrib/build.xml
M hadoop-mapreduce-project/src/java
M hadoop-mapreduce-project/src/webapps/job
M hadoop-mapreduce-project/src/c++
M hadoop-mapreduce-project/src/examples
M hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
M hadoop-common-project/hadoop-common/CHANGES.txt
M hadoop-common-project/hadoop-common/src/test/core
M hadoop-common-project/hadoop-common/src/main/java
M hadoop-common-project/hadoop-common/src/main/docs
➜ trunk
{code}
I'd really like to do this to avoid the silly merge pains I've been enduring.
> Propdel all svn:mergeinfo
> -------------------------
>
> Key: HADOOP-8435
> URL: https://issues.apache.org/jira/browse/HADOOP-8435
> Project: Hadoop Common
> Issue Type: Bug
> Affects Versions: 2.0.0-alpha, 3.0.0
> Reporter: Harsh J
> Assignee: Harsh J
>
> 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:
> {code}
> 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'
> {code}
> Proposed set of fix (from http://stackoverflow.com/questions/767418/remove-unnecessary-svnmergeinfo-properties):
> {code}
> svn propdel svn:mergeinfo -R
> svn revert .
> svn commit -m <appropriate message>
> {code}
> (To be done on branch-2 and trunk both)
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira